Changeset 4100

Show
Ignore:
Timestamp:
06/20/07 19:06:46 (6 years ago)
Author:
p_lindheimer
Message:

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

........

r4098 | p_lindheimer | 2007-06-20 16:03:28 -0700 (Wed, 20 Jun 2007) | 1 line


#2002: IF() statement can't handle : in the string and can't escape them anyhow

........

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,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092 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,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098

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

    r4094 r4100  
    103103          // 
    104104          if ((isset($dring) ? $dring : '') != '') { 
    105             $ext->add($contextname, $grpnum, '', new ext_setvar("__ALERT_INFO", '${IF($["x${ALERT_INFO}"="x"]?'.str_replace(';', '\;', $dring).':${ALERT_INFO})}')); 
     105            // If ALERTINFO is set, then skip to the next set command. This was modified to two lines because the previous 
     106            // IF() couldn't handle ':' as part of the string. The jump to PRIORITY+2 allows for now destination label 
     107            // which is needed in the 2.3 version. 
     108            $ext->add($contextname, $grpnum, '', new ext_gotoif('$["x${ALERT_INFO}"!="x"]','$[${PRIORITY}+2])}')); 
     109            $ext->add($contextname, $grpnum, '', new ext_setvar("__ALERT_INFO", str_replace(';', '\;', $dring) )); 
    106110          } 
    107111          // If pre_ring is set, then ring this number of seconds prior to moving on 

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

    r4095 r4100  
    22  <rawname>findmefollow</rawname> 
    33  <name>Follow Me</name> 
    4   <version>2.4.12</version> 
     4  <version>2.4.12.1</version> 
    55  <changelog> 
     6    *2.4.12.1* #2002 IF() statement can't handle : in the string and can't escape them anyhow 
    67    *2.4.12* Fixed bug where nested CID prefixes ends up removing part of the valid CID info 
    78    *2.4.11.1* Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it