Show
Ignore:
Timestamp:
05/29/08 12:17:16 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5756 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5756 | p_lindheimer | 2008-05-29 10:14:57 -0700 (Thu, 29 May 2008) | 1 line


#2828: fix bug allowing fixlocalprefix to return 0 as valid dialstring

........

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,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753 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,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756

  • modules/branches/2.3/core/agi-bin/fixlocalprefix

    r5094 r5757  
    233233      // $rule is a dial rule 
    234234       
    235       if ($newnum = fixNumber($rule, $number, $agi)) { 
     235      if (($newnum = fixNumber($rule, $number, $agi)) !== false) { 
    236236        $agi->verbose('Dialpattern '.$rule.' matched. '.$number.' -> '.$newnum, 2); 
    237237        $agi->set_variable("DIAL_NUMBER", $newnum);