Changeset 7415

Show
Ignore:
Timestamp:
01/15/09 11:00:45 (4 years ago)
Author:
p_lindheimer
Message:

fixes #3474 move deny to top of context on iax sections as in sip sections

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.5/core/functions.inc.php

    r7342 r7415  
    343343      }  
    344344 
    345       // Move all 'disallow=all' to the top to avoid errors 
     345      // Move all 'disallow=all' and deny to the top to avoid errors 
    346346      // 
    347347      $results2 = array(); 
     
    349349        $options = explode("&", $element['data']); 
    350350        foreach ($options as $option) { 
    351           if ($element['keyword'] == 'disallow' && $option == 'all') { 
     351          if (($element['keyword'] == 'disallow' && $option == 'all') | ($element['keyword'] == 'deny')) { 
    352352            array_unshift($results2,array('keyword'=>$element['keyword'],'data'=>$option)); 
    353353          } else { 
  • modules/branches/2.5/core/module.xml

    r7365 r7415  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.5.1.4</version> 
     6  <version>2.5.1.5</version> 
    77  <candisable>no</candisable> 
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
     10    *2.5.1.5* #3474 
    1011    *2.5.1.4* #3380, #3451, #932, #3358, #3426 
    1112    *2.5.1.3* #3380, #3358, #3387, localizations