diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-11-10 22:03:07 -0700 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-11-10 22:43:08 -0700 |
| commit | 88bc276013552268ebef7058cd7b58c89de67125 (patch) | |
| tree | 5f496839e6dd01a9ece86526e869ac446568c114 /usr/local/www/interfaces_assign.php | |
| parent | ea57ccb86b5c75246dabb8306c35b997cb4ede9d (diff) | |
| download | pfsense-88bc276013552268ebef7058cd7b58c89de67125.zip pfsense-88bc276013552268ebef7058cd7b58c89de67125.tar.gz | |
Fix filter_rules_sort's compare function to know about floating rules so it won't change their order.
Diffstat (limited to 'usr/local/www/interfaces_assign.php')
| -rwxr-xr-x | usr/local/www/interfaces_assign.php | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index b4c8525..fbd6e7f 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -320,7 +320,7 @@ if ($_GET['act'] == "add") { $config['interfaces'][$newifname]['descr'] = $descr; } - uksort($config['interfaces'], "compare_interface_names"); + uksort($config['interfaces'], "compare_interface_friendly_names"); /* Find an unused port for this interface */ foreach ($portlist as $portname => $portinfo) { @@ -350,21 +350,6 @@ if ($_GET['act'] == "add") { } -function compare_interface_names($a, $b) { - if ($a == $b) - return 0; - else if ($a == 'wan') - return -1; - else if ($b == 'wan') - return 1; - else if ($a == 'lan') - return -1; - else if ($b == 'lan') - return 1; - - return strnatcmp($a, $b); -} - include("head.inc"); if(file_exists("/var/run/interface_mismatch_reboot_needed")) |
