From 47d252bc2a544615adaf1f3b0c9899614e0f7950 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 16 Jan 2020 14:11:54 +0100
Subject: [sysconfig] Honor config module type sort order

---
 modules-available/sysconfig/addconfig.inc.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules-available/sysconfig/addconfig.inc.php')

diff --git a/modules-available/sysconfig/addconfig.inc.php b/modules-available/sysconfig/addconfig.inc.php
index d9bed6f1..e804bbda 100644
--- a/modules-available/sysconfig/addconfig.inc.php
+++ b/modules-available/sysconfig/addconfig.inc.php
@@ -161,7 +161,9 @@ class AddConfig_Start extends AddConfig_Base
 			$title = '';
 		}
 		$dummy = 0;
+		$sort = [];
 		foreach ($modGroups as &$mod) {
+			$sort[] = $mod['sortOrder'];
 			if (!empty($mod['modules']) && $mod['unique']) {
 				array_unshift($mod['modules'], array(
 					'moduleid' => 'x' . (++$dummy),
@@ -169,6 +171,7 @@ class AddConfig_Start extends AddConfig_Base
 				));
 			}
 		}
+		array_multisort($sort, SORT_ASC | SORT_NUMERIC, $modGroups);
 		unset($mod);
 		Render::addDialog(Dictionary::translate("lang_configurationCompilation"), false, 'cfg-start', array(
 			'step' => 'AddConfig_Finish',
-- 
cgit v1.2.3-55-g7522