Changeset 12455

Show
Ignore:
Timestamp:
08/29/11 17:28:53 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11567-11569,11572,11754,11896-11897,11899,12018-12019,12233-12234,12382,12385,12387,12452,12454 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.8

........

r12387 | p_lindheimer | 2011-08-09 15:12:07 -0700 (Tue, 09 Aug 2011) | 1 line


should fix custom trunk destination re #5314 pls test and provide feedback then will put in and merge up

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svnmerge-integrated changed from /modules/branches/2.8:1-11555 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

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

    r12434 r12455  
    15501550            // TODO we don't have the OUTNUM until later so fix this... 
    15511551            case 'custom': 
    1552               $dial_string = str_replace('$OUTNUM$','\\\\$\\\\{OUTNUM\\\\}',$trunkprops['channelid']); 
     1552              $dial_string = str_replace('$OUTNUM$','${SS}{OUTNUM}',$trunkprops['channelid']); 
     1553              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('SS','$')); 
    15531554              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('TDIAL_STRING',$dial_string)); 
    15541555              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('DIAL_TRUNK',$trunkprops['trunkid'] )); 

  • modules/branches/2.9/core/module.xml

    r12435 r12455  
    55  <category>Basic</category> 
    66  <name>Core</name> 
    7   <version>2.9.0.3</version> 
     7  <version>2.9.0.4</version> 
    88  <publisher>FreePBX</publisher> 
    99  <license>GPLv2+</license>