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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r13622 r13737  
    13131313            $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); 
    13141314          } else { 
    1315             $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 
     1315            if ($exten == 's'){ 
     1316              $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); 
     1317            }else{ 
     1318              $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 
     1319            } 
    13161320          } 
    13171321          // always set CallerID name