mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3889 from nextcloud/downstream-26950 

Sharing dialog: make autocomplete sorting case insensitive
This commit is contained in:
Morris Jobke 2017-03-23 23:45:28 -06:00 committed by GitHub
parent e18d928d9b dbaebc53b0
commit d197f609a8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/User/Database.php
View File

@ -193,7 +193,7 @@ class Database extends Backend implements IUserBackend {
$displayNames = array();
$query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
. $searchLike .' ORDER BY `uid` ASC', $limit, $offset);
. $searchLike .' ORDER BY LOWER(`displayname`), LOWER(`uid`) ASC', $limit, $offset);
$result = $query->execute($parameters);
while ($row = $result->fetchRow()) {
$displayNames[$row['uid']] = $row['displayname'];
@ -284,7 +284,7 @@ class Database extends Backend implements IUserBackend {
$searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)';
}
$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY `uid` ASC', $limit, $offset);
$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset);
$result = $query->execute($parameters);
$users = array();
while ($row = $result->fetchRow()) {

2
lib/private/User/Manager.php
View File

@ -254,7 +254,7 @@ class Manager extends PublicEmitter implements IUserManager {
* @var \OC\User\User $a
* @var \OC\User\User $b
*/
return strcmp($a->getDisplayName(), $b->getDisplayName());
return strcmp(strtolower($a->getDisplayName()), strtolower($b->getDisplayName()));
});
return $users;
}