Changeset 13904

Show
Ignore:
Timestamp:
03/23/12 17:35:45 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 13900 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.10

........

r13900 | p_lindheimer | 2012-03-23 14:27:18 -0700 (Fri, 23 Mar 2012) | 1 line


fixes #5710 bad syntax thanks for the fix TSM

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svn:mergeinfo changed from /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741,13773,13845,13864 to /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741,13773,13845,13864,13900
    • Property svnmerge-integrated changed from /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741,13773,13845,13864 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741,13773,13845,13864-13865,13867,13869-13896,13898,13900 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

  • modules/branches/2.9/campon/functions.inc.php

    r13865 r13904  
    206206      $exten = '_X._X.'; 
    207207 
    208       $ext->add($context, $exten, '', new ext_gosub('sub-from-ccss,s,1(${CUT(EXTEN,_,2)})')); 
     208      $ext->add($context, $exten, '', new ext_gosub(1,'s','sub-from-ccss','${CUT(EXTEN,_,2)}')); 
    209209      $ext->add($context, $exten, 'no_alert', new ext_goto('1','${CUT(EXTEN,_,1)}','from-internal')); 
    210210 
    …… 
    212212      $exten = '_X._X.'; 
    213213 
    214       $ext->add($context, $exten, '', new ext_gosub('sub-from-ccss,s,1(${CUT(EXTEN,_,2)})')); 
     214      $ext->add($context, $exten, '', new ext_gosub(1,'s','sub-from-ccss','${CUT(EXTEN,_,2)}')); 
    215215      $ext->add($context, $exten, '', new ext_goto('1','${CUT(EXTEN,_,1)}','ext-local')); 
    216216