Changeset 12397

Show
Ignore:
Timestamp:
08/10/11 18:25:23 (2 years ago)
Author:
xrobau
Message:

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

........

r12396 | xrobau | 2011-08-11 07:40:09 +1000 (Thu, 11 Aug 2011) | 2 lines


Asterisk no longer supports pipe as a delimiter

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.9

    • Property svnmerge-integrated changed from /freepbx/trunk:1-11116,12060,12212-12221,12224 /freepbx/branches/2.8:1-11479,12035 to /freepbx/branches/2.8:1-11479,12035 /freepbx/trunk:1-11116,12060,12212-12221,12224,12396

  • freepbx/branches/2.9/amp_conf/agi-bin/phpagi.php

    r10865 r12397  
    335335    function exec($application, $options) 
    336336    { 
    337       if(is_array($options)) $options = join('|', $options); 
     337      if(is_array($options)) $options = join(',', $options); 
    338338      return $this->evaluate("EXEC $application $options"); 
    339339    } 
    …… 
    852852    function exec_dial($type, $identifier, $timeout=NULL, $options=NULL, $url=NULL) 
    853853    { 
    854       return $this->exec('Dial', trim("$type/$identifier|$timeout|$options|$url", '|')); 
     854      return $this->exec('Dial', trim("$type/$identifier,$timeout,$options,$url", ',')); 
    855855    } 
    856856 
    …… 
    868868    function exec_goto($a, $b=NULL, $c=NULL) 
    869869    { 
    870       return $this->exec('Goto', trim("$a|$b|$c", '|')); 
     870      return $this->exec('Goto', trim("$a,$b,$c", ',')); 
    871871    } 
    872872