Changeset 13738 for modules

Show
Ignore:
Timestamp:
03/01/12 17:17:14 (1 year ago)
Author:
p_lindheimer
Message:

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

........

r13737 | p_lindheimer | 2012-03-01 14:15:33 -0800 (Thu, 01 Mar 2012) | 1 line


fixes #5385 don't replace FROM_DID with s if set properly

........

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 to /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478,13730,13737
    • 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 /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 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

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

    r13451 r13738  
    12671267            $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); 
    12681268          } else { 
    1269             $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 
     1269            if ($exten == 's'){ 
     1270              $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); 
     1271            }else{ 
     1272              $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 
     1273            } 
    12701274          } 
    12711275          // always set CallerID name