Changeset 3867

Show
Ignore:
Timestamp:
03/14/07 12:22:48 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3866 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.2

Manual change: module revision numbers are different

........

r3866 | p_lindheimer | 2007-03-14 09:18:15 -0700 (Wed, 14 Mar 2007) | 1 line


Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866

  • modules/branches/2.3/findmefollow/functions.inc.php

    r3763 r3867  
    102102          // 
    103103          if ((isset($dring) ? $dring : '') != '') { 
    104             $ext->add($contextname, $grpnum, '', new ext_setvar("__ALERT_INFO", '${IF($["x${ALERT_INFO}"="x"]?"'.str_replace(';', '\;', $dring).'":"")}')); 
     104            $ext->add($contextname, $grpnum, '', new ext_setvar("__ALERT_INFO", '${IF($["x${ALERT_INFO}"="x"]?'.str_replace(';', '\;', $dring).':${ALERT_INFO})}')); 
    105105          } 
    106106          // If pre_ring is set, then ring this number of seconds prior to moving on 

  • modules/branches/2.3/findmefollow/module.xml

    r3764 r3867  
    22  <rawname>findmefollow</rawname> 
    33  <name>Follow Me</name> 
    4   <version>2.4.11</version> 
     4  <version>2.4.11.1</version> 
    55  <changelog> 
     6    *2.4.11.1* Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it 
    67    *2.4.11* added option to have follow-me always be used in place of extension, or only when explicitly used as a destination, useful in conjunction with VmX 
    78    *2.4.10* introduction of firstavailable firstnotonphone strategy that only rings one extension and optionally skips callwaiting REQUIRE CORE r3652