From cb8ab18e9b5d671cef1d75878894235705adafb2 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Wed, 1 Sep 2021 14:54:39 +0200
Subject: [PATCH] fix ordering of configuration administration, fixes #144
---
app/controllers/admin/configuration.php | 2 --
lib/classes/Config.class.php | 4 +---
lib/classes/ConfigurationModel.php | 5 +++++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/controllers/admin/configuration.php b/app/controllers/admin/configuration.php
index 802eebe2e5e..1e6b3c352fe 100644
--- a/app/controllers/admin/configuration.php
+++ b/app/controllers/admin/configuration.php
@@ -80,8 +80,6 @@ class Admin_ConfigurationController extends AuthenticatedController
*/
public function edit_configuration_action()
{
-
-
$field = Request::get('field');
$value = Request::get('value');
diff --git a/lib/classes/Config.class.php b/lib/classes/Config.class.php
index e9988944008..f5afaab3ebd 100644
--- a/lib/classes/Config.class.php
+++ b/lib/classes/Config.class.php
@@ -105,9 +105,7 @@ class Config implements ArrayAccess, Countable, IteratorAggregate
});
}
- $fields = array_keys($temp);
- sort($fields, SORT_NATURAL | SORT_FLAG_CASE);
- return $fields;
+ return array_keys($temp);
}
/**
diff --git a/lib/classes/ConfigurationModel.php b/lib/classes/ConfigurationModel.php
index 6aa15f627df..9ce5a38e1f8 100644
--- a/lib/classes/ConfigurationModel.php
+++ b/lib/classes/ConfigurationModel.php
@@ -57,6 +57,11 @@ class ConfigurationModel
$allconfigs[] = $metadata;
}
}
+
+ usort($allconfigs, function ($a, $b) {
+ return strcmp($a['field'], $b['field']);
+ });
+
return $allconfigs;
}
--
GitLab