From 14d53f5b8d37f1cd362ef2b5978d6cc08628aef9 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 11 Aug 2016 10:58:44 +0200 Subject: [PATCH] (legacy) ditch compare_interface_friendly_names --- src/etc/inc/util.inc | 17 ----------------- src/www/interfaces_assign.php | 1 - 2 files changed, 18 deletions(-) diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index a0bf74e44..7daee917b 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -741,23 +741,6 @@ function get_configured_vips_list() return $alias_list; } -/* comparison function for sorting by the order in which interfaces are normally created */ -function compare_interface_friendly_names($a, $b) -{ - if ($a == $b) { - return 0; - } elseif ($a == 'wan') { - return -1; - } elseif ($b == 'wan') { - return 1; - } elseif ($a == 'lan') { - return -1; - } elseif ($b == 'lan') { - return 1; - } - return strnatcmp($a, $b); -} - /* return the configured interfaces list. */ function get_configured_interface_list($only_opt = false, $withdisabled = false) { diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php index f6bd8b4bb..07b371c26 100644 --- a/src/www/interfaces_assign.php +++ b/src/www/interfaces_assign.php @@ -165,7 +165,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { interface_sync_wireless_clones($config['interfaces'][$newifname], false); } - uksort($config['interfaces'], "compare_interface_friendly_names"); write_config(); header("Location: interfaces_assign.php"); exit;