From 03cf4b577d0a0def663ad9f078e005ea391caef5 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 28 Mar 2017 12:08:25 +0200
Subject: [permission-manager] role-list order consistency

---
 modules-available/permissionmanager/inc/getdata.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules-available/permissionmanager/inc')

diff --git a/modules-available/permissionmanager/inc/getdata.inc.php b/modules-available/permissionmanager/inc/getdata.inc.php
index 7eac333f..481ac398 100644
--- a/modules-available/permissionmanager/inc/getdata.inc.php
+++ b/modules-available/permissionmanager/inc/getdata.inc.php
@@ -18,7 +18,7 @@ class GetData {
 
 	// get all roles from database (id and name)
 	public static function getRoles() {
-		$res = Database::simpleQuery("SELECT id, name FROM role ORDER BY name");
+		$res = Database::simpleQuery("SELECT id, name FROM role ORDER BY name ASC");
 		$data = array();
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 			$data[] = array(
@@ -31,7 +31,7 @@ class GetData {
 
 	// UserID, User Login Name, Roles of each User
 	private static function queryUserData() {
-		$res = Database::simpleQuery("SELECT user.userid AS userid, user.login AS login, GROUP_CONCAT(role.name) AS role
+		$res = Database::simpleQuery("SELECT user.userid AS userid, user.login AS login, GROUP_CONCAT(role.name ORDER BY role.name ASC) AS role
 												FROM user
 													LEFT JOIN userXrole ON user.userid = userXrole.userid
 													LEFT JOIN role ON userXrole.roleid = role.id
-- 
cgit v1.2.3-55-g7522