diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-01 20:57:21 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 01:29:32 -0500 |
| commit | b94f9ae3029777fa0aba2f3cb52b321925ce7e72 (patch) | |
| tree | 7bd19036716759f90947cae0c46acce080f5eb34 /phpBB/includes | |
| parent | 7adae349a96d5dffbd47ea5eca1e6bee481b7ce1 (diff) | |
| download | forums-b94f9ae3029777fa0aba2f3cb52b321925ce7e72.tar forums-b94f9ae3029777fa0aba2f3cb52b321925ce7e72.tar.gz forums-b94f9ae3029777fa0aba2f3cb52b321925ce7e72.tar.bz2 forums-b94f9ae3029777fa0aba2f3cb52b321925ce7e72.tar.xz forums-b94f9ae3029777fa0aba2f3cb52b321925ce7e72.zip | |
[ticket/11305] Retrieve cache driver from container rather than cache service.
This only covers some of the call sites.
PHPBB3-11305
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8528dc91c4..52a82004e8 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -740,15 +740,15 @@ class acp_modules */ function remove_cache_file() { - global $cache; + global $phpbb_container; // Sanitise for future path use, it's escaped as appropriate for queries $p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class)); - $cache->destroy('_modules_' . $p_class); + $phpbb_container->get('cache.driver')->destroy('_modules_' . $p_class); // Additionally remove sql cache - $cache->destroy('sql', MODULES_TABLE); + $phpbb_container->get('cache.driver')->destroy('sql', MODULES_TABLE); } /** diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index a50d5175fe..6abcdee8f2 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -3463,7 +3463,7 @@ function group_validate_groupname($group_id, $group_name) */ function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false) { - global $cache, $db, $phpbb_dispatcher; + global $phpbb_container, $db, $phpbb_dispatcher; if (empty($user_id_ary)) { @@ -3579,7 +3579,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal } // Because some tables/caches use usercolour-specific data we need to purge this here. - $cache->destroy('sql', MODERATOR_CACHE_TABLE); + $phpbb_container->get('cache.driver')->destroy('sql', MODERATOR_CACHE_TABLE); } /** |