Changeset 13451 for modules

Show
Ignore:
Timestamp:
02/16/12 15:05:16 (1 year ago)
Author:
p_lindheimer
Message:

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

........

r13450 | p_lindheimer | 2012-02-16 12:03:27 -0800 (Thu, 16 Feb 2012) | 1 line


fixes #5300 for call trace, thanks bbeimer and arpagon

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svn:mergeinfo changed from /modules/branches/2.10:13090,13103-13104,13106 to /modules/branches/2.10:13090,13103-13104,13106,13450
    • Property svnmerge-integrated changed from /modules/branches/2.10:1-12085,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.10:1-12085,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

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

    r13070 r13451  
    35943594        $ext->add($mcontext,$exten,'', new ext_gosubif('$["${DEXTEN:-1}"!="#"]','dstring,1','dlocal,1')); 
    35953595        $ext->add($mcontext,$exten,'', new ext_gotoif('$[${LEN(${DSTRING})}=0]','nodial')); 
    3596         $ext->add($mcontext,$exten,'', new ext_gotoif('$["${DEXTEN:-1}"!="#"]','skiptrace')); 
     3596        $ext->add($mcontext,$exten,'', new ext_gotoif('$["${DEXTEN:-1}"="#"]','skiptrace')); 
    35973597        $ext->add($mcontext,$exten,'', new ext_gosubif('$[${REGEX("^[\+]?[0-9]+$" ${CALLERID(number)})} = 1]','ctset,1','ctclear,1')); 
    35983598        //TODO: do we need to check for anything beyond auto-blkvm in this call path?