Merge pull request #9617 from nextcloud/users-sort-case-fix

Ignore case when sorting users

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 6784359538d..494a345be59 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -239,7 +239,7 @@ class Manager extends PublicEmitter implements IUserManager {
 			 * @var \OC\User\User $a
 			 * @var \OC\User\User $b
 			 */
-			return strcmp($a->getUID(), $b->getUID());
+			return strcasecmp($a->getUID(), $b->getUID());
 		});
 		return $users;
 	}
@@ -268,7 +268,7 @@ class Manager extends PublicEmitter implements IUserManager {
 			 * @var \OC\User\User $a
 			 * @var \OC\User\User $b
 			 */
-			return strcmp(strtolower($a->getDisplayName()), strtolower($b->getDisplayName()));
+			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
 		});
 		return $users;
 	}
diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php
index 2ecae3a8500..d2e48ffa538 100644
--- a/tests/lib/User/ManagerTest.php
+++ b/tests/lib/User/ManagerTest.php
@@ -236,7 +236,7 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getUsers')
 			->with($this->equalTo('fo'))
-			->will($this->returnValue(array('foo', 'afoo')));
+			->will($this->returnValue(array('foo', 'afoo', 'Afoo1', 'Bfoo')));
 		$backend->expects($this->never())
 			->method('loginName2UserName');
 
@@ -244,8 +244,10 @@ class ManagerTest extends TestCase {
 		$manager->registerBackend($backend);
 
 		$result = $manager->search('fo');
-		$this->assertEquals(2, count($result));
+		$this->assertEquals(4, count($result));
 		$this->assertEquals('afoo', array_shift($result)->getUID());
+		$this->assertEquals('Afoo1', array_shift($result)->getUID());
+		$this->assertEquals('Bfoo', array_shift($result)->getUID());
 		$this->assertEquals('foo', array_shift($result)->getUID());
 	}