Skip to content

support pushing to CappedMemoryCache #4150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Mar 30, 2017
Merged

support pushing to CappedMemoryCache #4150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc4b983
support pushing to CappedMemoryCache
icewind1991 Mar 29, 2017
0aeb595
user ids are strings
icewind1991 Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/private/Cache/CappedMemoryCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ public function get($key) {
}

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();
}

Expand Down
3 changes: 2 additions & 1 deletion lib/private/User/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,10 @@ public function checkPassword($uid, $password) {
* @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;
}
Expand Down