diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
| commit | 208770d7fddefb7ac46dd63387bc8ab4a2724edd (patch) | |
| tree | 4d9377436c29a2b272505f7d9039d7110a48054d /phpBB/install/database_update.php | |
| parent | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (diff) | |
| parent | 0483971f7786b10c3359dfbe4912501de0d6c7de (diff) | |
| download | forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.gz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.bz2 forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.xz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.zip | |
Merge remote-tracking branch 'p/ticket/11305' into develop
* p/ticket/11305:
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
[ticket/11305] Extract hook finder from cache service.
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 87b1188c65..8950d677ae 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -133,7 +133,8 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); - foreach ($cache->obtain_hooks() as $hook) + $phpbb_hook_finder = $phpbb_container->get('hook_finder'); + foreach ($phpbb_hook_finder->find() as $hook) { @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); } @@ -186,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); @@ -573,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(); |