From dc4b98363956b1617749ff0abced8f68a6a5da49 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 29 Mar 2017 19:16:12 +0200 Subject: [PATCH 1/2] support pushing to CappedMemoryCache Signed-off-by: Robin Appelman --- lib/private/Cache/CappedMemoryCache.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/Cache/CappedMemoryCache.php b/lib/private/Cache/CappedMemoryCache.php index c6b45c49c1..2e180cfb01 100644 --- a/lib/private/Cache/CappedMemoryCache.php +++ b/lib/private/Cache/CappedMemoryCache.php @@ -47,7 +47,11 @@ class CappedMemoryCache implements ICache, \ArrayAccess { } public function set($key, $value, $ttl = 0) { - $this->cache[$key] = $value; + if (is_null($key)) { + $this->cache[] = $value; + } else { + $this->cache[$key] = $value; + } $this->garbageCollect(); } From 0aeb5957840866e77391809f16999222dbb0b12a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 30 Mar 2017 12:24:46 +0200 Subject: [PATCH 2/2] user ids are strings Signed-off-by: Robin Appelman --- lib/private/User/Database.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index 22b335ebfb..73506c7d7c 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -237,9 +237,10 @@ class Database extends Backend implements IUserBackend { * @return boolean true if user was found, false otherwise */ private function loadUser($uid) { + $uid = (string) $uid; if (!isset($this->cache[$uid])) { //guests $uid could be NULL or '' - if ($uid === null || $uid === '') { + if ($uid === '') { $this->cache[$uid]=false; return true; }