Changeset 5740

Show
Ignore:
Timestamp:
04/20/08 12:50:28 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5739 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5739 | p_lindheimer | 2008-04-20 09:49:13 -0700 (Sun, 20 Apr 2008) | 1 line


Use new CALLERPRES() funtion in place of SetCallerPres?() in 1.6 - old version deprecated

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.4

    • Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736 to /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739

  • freepbx/branches/2.4/amp_conf/htdocs/admin/extensions.class.php

    r5578 r5740  
    629629class ext_setcallerpres extends extension { 
    630630  function output() { 
    631     return "SetCallerPres({$this->data})"; 
     631    global $version; 
     632 
     633    if (version_compare($version, "1.6", "lt")) { 
     634      return "SetCallerPres({$this->data})"; 
     635    } else { 
     636      return "Set(CALLERPRES()={$this->data})"; 
     637    } 
    632638  } 
    633639}