summaryrefslogtreecommitdiffstats
path: root/src/etc/inc
diff options
context:
space:
mode:
authorChris Rowe <chris@c-c-c.co.uk>2017-02-12 03:46:46 +0000
committerChris Rowe <chris@c-c-c.co.uk>2017-02-12 03:46:46 +0000
commit065bd33d2ef1967d976e40842f4eb34f9a487a5f (patch)
tree41a30f67b0def458b8a5edbb472ef446ab442f63 /src/etc/inc
parentea9d2cd377f22a90795e6874c4d033d0ae98eca6 (diff)
downloadpfsense-065bd33d2ef1967d976e40842f4eb34f9a487a5f.zip
pfsense-065bd33d2ef1967d976e40842f4eb34f9a487a5f.tar.gz
Fix incorrect sorting for various dropdown lists.
Diffstat (limited to 'src/etc/inc')
-rw-r--r--src/etc/inc/gwlb.inc3
-rw-r--r--src/etc/inc/util.inc3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc
index f3e7904..d7cecc0 100644
--- a/src/etc/inc/gwlb.inc
+++ b/src/etc/inc/gwlb.inc
@@ -630,6 +630,9 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive
}
}
unset($gateway);
+
+ //Sort the array by GW name before moving on.
+ ksort($gateways_arr, SORT_STRING | SORT_FLAG_CASE);
/* Loop through all interfaces with a gateway and add it to a array */
if ($disabled == false) {
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index 937f899..2191f84 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -1420,7 +1420,8 @@ function get_configured_interface_with_descr($only_opt = false, $withdisabled =
}
}
}
-
+
+ asort($iflist);
return $iflist;
}
OpenPOWER on IntegriCloud