summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-10-10 10:52:07 +0200
committerGitHub <noreply@github.com>2016-10-10 10:52:07 +0200
commit2dcd97bf144fac80d68df813d9d002bcbe3e1d6b (patch)
tree4e4f73bf78ef84ab2fec1dbade4f5d8ea8d263a9
parenta0cb8093423ef1384e8945235cd21b0c0e98f51f (diff)
parent1273d82e8b93241a78224c761e17d82dedd51047 (diff)
downloadnextcloud-server-2dcd97bf144fac80d68df813d9d002bcbe3e1d6b.tar.gz
nextcloud-server-2dcd97bf144fac80d68df813d9d002bcbe3e1d6b.zip
Merge pull request #1672 from nextcloud/cache_non_exisiting_db_user
Cache non existing DB user
-rw-r--r--lib/private/User/Database.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index eba7beffeae..28cb3302858 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -94,6 +94,9 @@ class Database extends Backend implements IUserBackend {
$query = \OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )');
$result = $query->execute(array($uid, \OC::$server->getHasher()->hash($password)));
+ // Clear cache
+ unset($this->cache[$uid]);
+
return $result ? true : false;
}
@@ -234,7 +237,7 @@ class Database extends Backend implements IUserBackend {
* @return boolean
*/
private function loadUser($uid) {
- if (empty($this->cache[$uid])) {
+ if (!isset($this->cache[$uid])) {
$query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
$result = $query->execute(array($uid));
@@ -243,6 +246,8 @@ class Database extends Backend implements IUserBackend {
return false;
}
+ $this->cache[$uid] = false;
+
while ($row = $result->fetchRow()) {
$this->cache[$uid]['uid'] = $row['uid'];
$this->cache[$uid]['displayname'] = $row['displayname'];
@@ -284,7 +289,7 @@ class Database extends Backend implements IUserBackend {
*/
public function userExists($uid) {
$this->loadUser($uid);
- return !empty($this->cache[$uid]);
+ return $this->cache[$uid] !== false;
}
/**