diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-04-13 14:54:20 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-04-13 14:54:20 -0700 |
| commit | 9f2fbbd9e64cece5e2f3f1d721a1157b739c85b7 (patch) | |
| tree | 5c08d5742defdd8f3a1577453c9f824930f7e92e /engine/lib/users.php | |
| parent | 9b526b7867a461841e4f990d4ea7945660dac18d (diff) | |
| parent | 21c92cf39d719a913cd9e29474c04781e9cd72ef (diff) | |
| download | elgg-9f2fbbd9e64cece5e2f3f1d721a1157b739c85b7.tar.gz elgg-9f2fbbd9e64cece5e2f3f1d721a1157b739c85b7.tar.bz2 | |
Merge pull request #5355 from cash/oom2
Fixes the DB query cache out of memory issues
Diffstat (limited to 'engine/lib/users.php')
| -rw-r--r-- | engine/lib/users.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 4a585c07f..868cd7815 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -237,7 +237,7 @@ function make_user_admin($user_guid) { } $r = update_data("UPDATE {$CONFIG->dbprefix}users_entity set admin='yes' where guid=$user_guid"); - invalidate_cache_for_entity($user_guid); + _elgg_invalidate_cache_for_entity($user_guid); return $r; } @@ -273,7 +273,7 @@ function remove_user_admin($user_guid) { } $r = update_data("UPDATE {$CONFIG->dbprefix}users_entity set admin='no' where guid=$user_guid"); - invalidate_cache_for_entity($user_guid); + _elgg_invalidate_cache_for_entity($user_guid); return $r; } @@ -558,8 +558,8 @@ function get_user_by_username($username) { // Caching if ((isset($USERNAME_TO_GUID_MAP_CACHE[$username])) - && (retrieve_cached_entity($USERNAME_TO_GUID_MAP_CACHE[$username]))) { - return retrieve_cached_entity($USERNAME_TO_GUID_MAP_CACHE[$username]); + && (_elgg_retrieve_cached_entity($USERNAME_TO_GUID_MAP_CACHE[$username]))) { + return _elgg_retrieve_cached_entity($USERNAME_TO_GUID_MAP_CACHE[$username]); } $query = "SELECT e.* from {$CONFIG->dbprefix}users_entity u @@ -592,9 +592,9 @@ function get_user_by_code($code) { // Caching if ((isset($CODE_TO_GUID_MAP_CACHE[$code])) - && (retrieve_cached_entity($CODE_TO_GUID_MAP_CACHE[$code]))) { + && (_elgg_retrieve_cached_entity($CODE_TO_GUID_MAP_CACHE[$code]))) { - return retrieve_cached_entity($CODE_TO_GUID_MAP_CACHE[$code]); + return _elgg_retrieve_cached_entity($CODE_TO_GUID_MAP_CACHE[$code]); } $query = "SELECT e.* from {$CONFIG->dbprefix}users_entity u |