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

Merge pull request #9292 from nextcloud/bugfix/9279/cast_db_backend_numeric 

Cast retrieved DB fields to string
This commit is contained in:
Roeland Jago Douma 2018-04-24 20:04:38 +02:00 committed by GitHub
parent 09398397b3 81f71cb1f9
commit d59791ab6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'];
}
@ -258,7 +259,7 @@ class Database extends ABackend
$result = $query->execute();
$displayNames = [];
while ($row = $result->fetch()) {
$displayNames[$row['uid']] = $row['displayname'];
$displayNames[(string)$row['uid']] = (string)$row['displayname'];
}
return $displayNames;
@ -296,7 +297,7 @@ class Database extends ABackend
if (!empty($newHash)) {
$this->setPassword($uid, $password);
}
return $row['uid'];
return (string)$row['uid'];
}
}
@ -337,8 +338,8 @@ class Database extends ABackend
// "uid" is primary key, so there can only be a single result
if ($row !== false) {
$this->cache[$uid]['uid'] = $row['uid'];
$this->cache[$uid]['displayname'] = $row['displayname'];
$this->cache[$uid]['uid'] = (string)$row['uid'];
$this->cache[$uid]['displayname'] = (string)$row['displayname'];
} else {
return false;
}
@ -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;
}