tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 08:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Sort LDAP user list"

Browse Source 
This reverts commit d4dc0177c0880ca3324b6854b219cef2d2ce9300.
This commit is contained in:
Johannes Meyer 2015-04-28 15:57:33 +02:00
parent adae7b34c1
commit 3da144f199
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Protocol/Ldap/Connection.php
View File

@ -426,7 +426,7 @@ class Connection
ldap_control_paged_result($this->ds, 0); ldap_control_paged_result($this->ds, 0);
} }
return $entries; return $entries; // TODO(7693): Sort entries post-processed
} }
protected function cleanupAttributes($attrs) protected function cleanupAttributes($attrs)

4
modules/setup/application/forms/AdminAccountPage.php
View File

@ -285,9 +285,7 @@ class AdminAccountPage extends Form
} }
try { try {
$users = $backend->listUsers(); return $backend->listUsers();
natsort ($users);
return $users;
} catch (Exception $e) { } catch (Exception $e) {
// No need to handle anything special here. Error means no users found. // No need to handle anything special here. Error means no users found.
return array(); return array();