Changeset 8353

Show
Ignore:
Timestamp:
09/09/09 16:02:29 (2 years ago)
Author:
p_lindheimer
Message:

closes #3854 fix sort order of old trunk dialrules in conversion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6/core/install.php

    r7630 r8353  
    325325} 
    326326 
     327function __order_DialRules($a, $b) { 
     328  return substr($a,4) > substr($b,4); 
     329} 
     330 
    327331function __migrate_trunks_to_table() { 
    328332 
    …… 
    547551  foreach ($conf as $tname => $rules) { 
    548552    $tid = ltrim($tname,'trunk-'); 
    549     ksort($rules); //make sure they are in order 
     553    uksort($rules,'__order_DialRules'); //make sure they are in order 
    550554    $seq = 1; 
    551555    foreach ($rules as $rule) { 

  • modules/branches/2.6/core/module.xml

    r8346 r8353  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.6.0RC1.1</version> 
     6  <version>2.6.0RC2.0</version> 
    77  <publisher>FreePBX</publisher> 
    88  <license>GPLv2+</license> 
    …… 
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
     12    *2.6.0RC2.0* #3854 
    1213    *2.6.0RC1.1* #3751 
    1314    *2.6.0RC1.0* #3529, #3864, #3538 

  • modules/branches/2.6/framework/module.xml

    r8350 r8353  
    22  <rawname>framework</rawname> 
    33  <name>FreePBX Framework</name> 
    4   <version>2.6.0.RC1.1</version> 
     4  <version>2.6.0.RC2.0</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
     10    *2.6.0RC2.0* #3854 
    1011    *2.6.0RC1.1* #3807, #3843, #3856, #3857 
    1112    *2.6.0RC1.0* #3850, #3837, #3858, #3861, #3678