From 3eb7ab2d9e18df44d1dbbdb1d3805335a0fac362 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 31 Mar 2018 09:34:36 +0000 Subject: [PATCH] Fix the version sorting in the federation statistics --- mod/admin.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 3cbb70d3c5..4ae5eb70b0 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -635,8 +635,21 @@ function admin_page_federation(App $a) $v = $newVv; } - foreach ($v as $key => $vv) - $v[$key]["version"] = trim(strip_tags($vv["version"])); + // Assure that the versions are sorted correctly + $v2 = []; + $versions = []; + foreach ($v as $vv) { + $version = trim(strip_tags($vv["version"])); + $v2[$version] = $vv; + $versions[] = $version; + } + + usort($versions, 'version_compare'); + + $v = []; + foreach ($versions as $version) { + $v[] = $v2[$version]; + } // the 3rd array item is needed for the JavaScript graphs as JS does // not like some characters in the names of variables... -- 2.39.5