diff options
author | jim-p <jimp@pfsense.org> | 2017-04-03 14:55:54 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2017-04-03 14:55:54 -0400 |
commit | f0875a7e6af8862ddd71b91b52194a96ff385d3b (patch) | |
tree | 68648d562112726f2dee880c1184e8bd2b23cd3b /src/etc/inc/util.inc | |
parent | 916168fdbb3628516a6887fe8384889ee40a42b9 (diff) | |
parent | 1d3510cf6cc471b179d52e03f4cfe77e23b4b20b (diff) | |
download | pfsense-f0875a7e6af8862ddd71b91b52194a96ff385d3b.zip pfsense-f0875a7e6af8862ddd71b91b52194a96ff385d3b.tar.gz |
Merge pull request #3685 from phil-davis/sort-if-names
Diffstat (limited to 'src/etc/inc/util.inc')
-rw-r--r-- | src/etc/inc/util.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 4e3af5d..d294d1d 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1409,7 +1409,7 @@ function get_configured_interface_list_by_realif($only_opt = false, $withdisable /* return the configured interfaces list with their description. */ function get_configured_interface_with_descr($only_opt = false, $withdisabled = false) { - global $config; + global $config, $user_settings; $iflist = array(); @@ -1426,8 +1426,11 @@ function get_configured_interface_with_descr($only_opt = false, $withdisabled = } } } - - asort($iflist); + + if ($user_settings['webgui']['interfacessort']) { + asort($iflist); + } + return $iflist; } |