Numeric only uids are no fun
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
074a0e0665
commit
81f71cb1f9
|
@ -222,6 +222,7 @@ class Database extends ABackend
|
||||||
* @return string display name
|
* @return string display name
|
||||||
*/
|
*/
|
||||||
public function getDisplayName($uid): string {
|
public function getDisplayName($uid): string {
|
||||||
|
$uid = (string)$uid;
|
||||||
$this->loadUser($uid);
|
$this->loadUser($uid);
|
||||||
return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
|
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) {
|
public function getUsers($search = '', $limit = null, $offset = null) {
|
||||||
$users = $this->getDisplayNames($search, $limit, $offset);
|
$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);
|
sort($userIds, SORT_STRING | SORT_FLAG_CASE);
|
||||||
return $userIds;
|
return $userIds;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue