2 files changed, 19 insertions, 5 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 0b3af3bdce..64c9ef9155 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -101,9 +101,6 @@ $phpbb_container = phpbb_create_install_container($phpbb_root_path, $phpEx);
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
-// set up caching
-$cache = $phpbb_container->get('cache');
-
 $phpbb_dispatcher = $phpbb_container->get('dispatcher');
 $request	= $phpbb_container->get('request');
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index c68cc27fb6..06fc2d2176 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -52,8 +52,8 @@ class install_install extends module
 
 	function main($mode, $sub)
 	{
-		global $lang, $template, $language, $phpbb_root_path;
-		global $phpbb_container;
+		global $lang, $template, $language, $phpbb_root_path, $phpEx;
+		global $phpbb_container, $cache;
 
 		switch ($sub)
 		{
@@ -102,6 +102,23 @@ class install_install extends module
 			break;
 
 			case 'final':
+				// Create a normal container now
+				$phpbb_container = phpbb_create_dumped_container_unless_debug(
+					array(
+						new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+						new phpbb_di_extension_core($phpbb_root_path),
+					),
+					array(
+						new phpbb_di_pass_collection_pass(),
+						new phpbb_di_pass_kernel_pass(),
+					),
+					$phpbb_root_path,
+					$phpEx
+				);
+
+				// Writes into global $cache
+				$cache = $phpbb_container->get('cache');
+
 				$this->build_search_index($mode, $sub);
 				$this->add_modules($mode, $sub);
 				$this->add_language($mode, $sub);