mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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;
// 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_count(null, null, null, $config);
@@ -574,7 +574,7 @@ else
add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version);
// Now we purge the session table as well as all cache files
$cache->purge();
$phpbb_container->get('cache.driver')->purge();
_print_footer();

5
phpBB/install/install_install.php
View File

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