diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-27 21:48:27 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:24 +0200 |
| commit | 91ca12f20ec0901a02222a83abd18df7efa84d81 (patch) | |
| tree | 654091692edd69066d33038d9d1d072b282e59a3 /phpBB/install/install_update.php | |
| parent | cefffe07771162da3dba1bbc7febc611b508e7aa (diff) | |
| download | forums-91ca12f20ec0901a02222a83abd18df7efa84d81.tar forums-91ca12f20ec0901a02222a83abd18df7efa84d81.tar.gz forums-91ca12f20ec0901a02222a83abd18df7efa84d81.tar.bz2 forums-91ca12f20ec0901a02222a83abd18df7efa84d81.tar.xz forums-91ca12f20ec0901a02222a83abd18df7efa84d81.zip | |
[ticket/12775] Update container and config in install/
PHPBB3-12775
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index c6f771a7d5..943b89f2d7 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -66,7 +66,9 @@ class install_update extends module function main($mode, $sub) { global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; - global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container; + global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_handler; + + extract($phpbb_config_php_handler->get_all()); // We must enable super globals, otherwise creating a new instance of the request class, // using the new container with a dbal connection will fail with the following PHP Notice: @@ -74,14 +76,14 @@ class install_update extends module $request->enable_super_globals(); // Create a normal container now + $phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); + $phpbb_container_factory->set_dump_container(false); + $phpbb_container_factory->set_use_extensions(false); if (file_exists($phpbb_root_path . 'install/update/new/config')) { - $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'install/update/new/config'); - } - else - { - $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'config'); + $phpbb_container_factory->set_config_path($phpbb_root_path . 'install/update/new/config'); } + $phpbb_container = $phpbb_container_factory->get_container(); // Writes into global $cache $cache = $phpbb_container->get('cache'); @@ -93,7 +95,6 @@ class install_update extends module $this->new_location = $phpbb_root_path . 'install/update/new/'; // Init DB - require($phpbb_root_path . 'config.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); // Special options for conflicts/modified files |