From 303e32fe9fbbe0897ea53dd8dd41c60abf1f0434 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 28 Jun 2018 12:35:30 +0200
Subject: [serversetup-bwlp] Simplify sorting of menu entries

---
 modules-available/serversetup-bwlp/page.inc.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php
index f2c422f3..061abfd5 100644
--- a/modules-available/serversetup-bwlp/page.inc.php
+++ b/modules-available/serversetup-bwlp/page.inc.php
@@ -186,10 +186,9 @@ class Page_ServerSetup extends Page
 		}
 		$menu['timeout'] = round($menu['timeoutms'] / 1000);
 		$menu['entries'] = Database::queryAll("SELECT menuentryid, entryid, hotkey, title, hidden, sortval, plainpass FROM
-			serversetup_menuentry WHERE menuid = :id", compact('id'));
+			serversetup_menuentry WHERE menuid = :id ORDER BY sortval ASC", compact('id'));
 		$keyList = array_map(function ($item) { return ['key' => $item]; }, MenuEntry::getKeyList());
 		$entryList = Database::queryAll("SELECT entryid, title, hotkey FROM serversetup_bootentry ORDER BY title ASC");
-		$sortVals = array();
 		foreach ($menu['entries'] as &$entry) {
 			$entry['isdefault'] = ($entry['menuentryid'] == $menu['defaultentryid']);
 			$entry['keys'] = $keyList;
@@ -207,12 +206,7 @@ class Page_ServerSetup extends Page
 					$item['title'] = $item['entryid'];
 				}
 			}
-			$sortVals[] = $entry['sortval'];
 		}
-		$arr = $menu['entries'];
-		$keys = array_keys($arr);
-		array_multisort( $sortVals, SORT_ASC, $arr, $keys);
-		$menu['entries'] = $arr;
 		// TODO: Make assigned locations editable
 		Permission::addGlobalTags($menu['perms'], 0, ['ipxe.menu.edit']);
 		Render::addTemplate('menu-edit', $menu);
-- 
cgit v1.2.3-55-g7522