Changeset 7916

Show
Ignore:
Timestamp:
08/02/09 20:57:48 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7915 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7915 | p_lindheimer | 2009-08-02 18:52:30 -0700 (Sun, 02 Aug 2009) | 1 line


fixes #3790 proper emergency cid when in deviceanduser mode

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890 to /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915

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

    r7899 r7916  
    18851885      $ext->add($context, $exten, '', new ext_set('AMPUSERCID', '${IF($["${DB_EXISTS(AMPUSER/${AMPUSER}/cidnum)}" = "1"]?${DB_RESULT}:${AMPUSER})}')); 
    18861886      $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '"${AMPUSERCIDNAME}" <${AMPUSERCID}>')); 
    1887       $ext->add($context, $exten, '', new ext_set('REALCALLERIDNUM', '${DB(DEVICE/${REALCALLERIDNUM}/user)}')); 
    18881887      /* 
    18891888       * This is where to splice in things like setting the language based on a user's astdb setting, 
    …… 
    19781977      $ext->add($context, $exten, '', new ext_gotoif('$["foo${DB(AMPUSER/${REALCALLERIDNUM}/device)}" = "foo"]', 'bypass')); 
    19791978 
    1980       $ext->add($context, $exten, 'normcid', new ext_set('USEROUTCID', '${DB(AMPUSER/${REALCALLERIDNUM}/outboundcid)}')); 
     1979      $ext->add($context, $exten, 'normcid', new ext_set('USEROUTCID', '${DB(AMPUSER/${AMPUSER}/outboundcid)}')); 
    19811980      $ext->add($context, $exten, 'bypass', new ext_set('EMERGENCYCID', '${DB(DEVICE/${REALCALLERIDNUM}/emergency_cid)}')); 
    19821981      $ext->add($context, $exten, '', new ext_set('TRUNKOUTCID', '${OUTCID_${ARG1}}'));