From 429c6dfb4710207fda63cb866bbdcd4cc06543fc Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 2 Dec 2022 15:25:52 +0100 Subject: [rebootcontrol/vmstore] Fix ArrayUtil::sortByColumn() calls --- modules-available/rebootcontrol/pages/task.inc.php | 2 +- modules-available/vmstore/page.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules-available') diff --git a/modules-available/rebootcontrol/pages/task.inc.php b/modules-available/rebootcontrol/pages/task.inc.php index b3110c66..dc50bfff 100644 --- a/modules-available/rebootcontrol/pages/task.inc.php +++ b/modules-available/rebootcontrol/pages/task.inc.php @@ -121,7 +121,7 @@ class SubPage $entry['timestamp_s'] = Util::prettyTime($entry['timestamp']); } unset($entry); - ArrayUtil::sortByColumn($active, 'timestamp', SORT_NUMERIC | SORT_ASC); + ArrayUtil::sortByColumn($active, 'timestamp', SORT_ASC, SORT_NUMERIC); Render::addTemplate('task-list', ['list' => $active]); } } diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php index 8d8a2461..1cc66642 100644 --- a/modules-available/vmstore/page.inc.php +++ b/modules-available/vmstore/page.inc.php @@ -208,7 +208,7 @@ class Page_VmStore extends Page $servers[] = ['idx' => 'nfs', 'server' => 'NFS']; } $servers[0]['checked'] = 'checked'; - ArrayUtil::sortByColumn($images, 'users', SORT_NUMERIC | SORT_DESC); + ArrayUtil::sortByColumn($images, 'users', SORT_DESC, SORT_NUMERIC); Module::isAvailable('js_stupidtable'); Render::addTemplate('benchmark-imgselect', [ 'id' => $id, -- cgit v1.2.3-55-g7522