aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_install.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-27 21:48:27 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-07 01:02:24 +0200
commit91ca12f20ec0901a02222a83abd18df7efa84d81 (patch)
tree654091692edd69066d33038d9d1d072b282e59a3 /phpBB/install/install_install.php
parentcefffe07771162da3dba1bbc7febc611b508e7aa (diff)
downloadforums-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_install.php')
-rw-r--r--phpBB/install/install_install.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 43fd6eaf07..d052297d81 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -51,7 +51,7 @@ class install_install extends module
function main($mode, $sub)
{
global $lang, $template, $language, $phpbb_root_path, $phpEx;
- global $phpbb_container, $cache, $phpbb_log, $request;
+ global $phpbb_container, $cache, $phpbb_log, $request, $phpbb_config_php_handler;
switch ($sub)
{
@@ -104,7 +104,8 @@ class install_install extends module
$request->enable_super_globals();
// Create a normal container now
- $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
+ $phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+ $phpbb_container = $phpbb_container_factory->get_container();
// Sets the global variables
$cache = $phpbb_container->get('cache');