From d6de892ee40579c45259f8c68ba7eef26accc08b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 13 Jul 2013 16:47:15 -0400
Subject: [ticket/11574] Fix various path issues in the updater

PHPBB3-11574
---
 phpBB/includes/functions_container.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_container.php')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index d302b75350..923a8f370b 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -53,7 +53,7 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext)
 */
 function phpbb_create_install_container($phpbb_root_path, $php_ext)
 {
-	$other_config_path = $phpbb_root_path . 'install/update/new/config';
+	$other_config_path = $phpbb_root_path . 'install/update/new/config/';
 	$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config';
 
 	$core = new phpbb_di_extension_core($config_path);
@@ -73,6 +73,30 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 	return $container;
 }
 
+/**
+* Create updater container
+*
+* @param string $phpbb_root_path Root path
+* @param string $php_ext PHP Extension
+* @param array $config_path Path to config directory
+* @return ContainerBuilder object (compiled)
+*/
+function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path)
+{
+	return phpbb_create_compiled_container(
+		array(
+			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext),
+			new phpbb_di_extension_core($config_path),
+		),
+		array(
+			new phpbb_di_pass_collection_pass(),
+			new phpbb_di_pass_kernel_pass(),
+		),
+		$phpbb_root_path,
+		$php_ext
+	);
+}
+
 /**
 * Create a compiled ContainerBuilder object
 *
-- 
cgit v1.2.1