From 81f71cb1f921c777087dc663c4b87a29483ff10f Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 24 Apr 2018 14:23:50 +0200
Subject: [PATCH] Numeric only uids are no fun
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/User/Database.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index 4d9bb15affa..001e0c0f4a5 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -222,6 +222,7 @@ class Database extends ABackend
* @return string display name
*/
public function getDisplayName($uid): string {
+ $uid = (string)$uid;
$this->loadUser($uid);
return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
}
@@ -357,7 +358,9 @@ class Database extends ABackend
*/
public function getUsers($search = '', $limit = null, $offset = null) {
$users = $this->getDisplayNames($search, $limit, $offset);
- $userIds = array_keys($users);
+ $userIds = array_map(function ($uid) {
+ return (string)$uid;
+ }, array_keys($users));
sort($userIds, SORT_STRING | SORT_FLAG_CASE);
return $userIds;
}
--
GitLab