From cc902ddee09c3d516a27c26fbf19af8f772814e6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 11:26:13 -0500
Subject: [ticket/11479] Fix install/update (rebuild container)

Code copied from fix in 11305

PHPBB3-11479
---
 phpBB/install/install_update.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index bfceed6b17..cf800aefd4 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -72,7 +72,24 @@ class install_update extends module
 	function main($mode, $sub)
 	{
 		global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
-		global $request, $phpbb_admin_path, $phpbb_adm_relative_path;
+		global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container;
+
+		// 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->tpl_name = 'install_update';
 		$this->page_title = 'UPDATE_INSTALLATION';
-- 
cgit v1.2.1


From 4becf85f5274bbe861da05917ab466eb072ea600 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 14:58:27 -0500
Subject: [ticket/11479] Use phpbb_create_default_container

PHPBB3-11479
---
 phpBB/install/install_update.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index cf800aefd4..aa1bd0fa35 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -75,18 +75,7 @@ class install_update extends module
 		global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container;
 
 		// 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
-		);
+		$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
 		// Writes into global $cache
 		$cache = $phpbb_container->get('cache');
-- 
cgit v1.2.1