makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11305] Retrieve cache driver from container rather than cache service.

Browse source 
This only covers some of the call sites.

PHPBB3-11305
This commit is contained in:
Oleg Pudeyev 2013-01-01 20:57:21 -05:00
parent 7adae349a9
commit b94f9ae302
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_modules.php
View file

@ -740,15 +740,15 @@ class acp_modules
*/ */
function remove_cache_file() function remove_cache_file()
{ {
global $cache; global $phpbb_container;
// Sanitise for future path use, it's escaped as appropriate for queries // Sanitise for future path use, it's escaped as appropriate for queries
$p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class)); $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 // Additionally remove sql cache
$cache->destroy('sql', MODULES_TABLE); $phpbb_container->get('cache.driver')->destroy('sql', MODULES_TABLE);
} }
/** /**

4
phpBB/includes/functions_user.php
View file

@ -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) 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)) 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. // 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);
} }
/** /**

4
phpBB/install/database_update.php
View file

@ -187,7 +187,7 @@ include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx);
$inline_update = (request_var('type', 0)) ? true : false; $inline_update = (request_var('type', 0)) ? true : false;
// To let set_config() calls succeed, we need to make the config array available globally // To let set_config() calls succeed, we need to make the config array available globally
$config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE); $config = new phpbb_config_db($db, $phpbb_container->get('cache.driver'), CONFIG_TABLE);
set_config(null, null, null, $config); set_config(null, null, null, $config);
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
@ -574,7 +574,7 @@ else
add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version); add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version);
// Now we purge the session table as well as all cache files // Now we purge the session table as well as all cache files
$cache->purge(); $phpbb_container->get('cache.driver')->purge();
_print_footer(); _print_footer();

5
phpBB/install/install_install.php
View file

@ -52,12 +52,13 @@ class install_install extends module
function main($mode, $sub) function main($mode, $sub)
{ {
global $lang, $template, $language, $phpbb_root_path, $cache; global $lang, $template, $language, $phpbb_root_path;
global $phpbb_container;
switch ($sub) switch ($sub)
{ {
case 'intro': case 'intro':
$cache->purge(); $phpbb_container->get('cache.driver')->purge();
$this->page_title = $lang['SUB_INTRO']; $this->page_title = $lang['SUB_INTRO'];