4 files changed, 27 insertions, 11 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index fb2f86341b..b435970692 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -100,7 +100,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat
 $phpbb_class_loader_ext->register();
 
 // Set up container
-$phpbb_container = phpbb_create_compiled_container(
+$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),
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index b99ce2d688..5ef64e6ecc 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -59,7 +59,7 @@ if (isset($_GET['avatar']))
 	$phpbb_class_loader_ext->register();
 
 	// Set up container
-	$phpbb_container = phpbb_create_compiled_container(
+	$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),
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 8e2c9606cd..e31fe381ac 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -77,14 +77,6 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 */
 function phpbb_create_compiled_container(array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
-	// Check for our cached container; if it exists, use it
-	$container_filename = phpbb_container_filename($phpbb_root_path, $php_ext);
-	if (file_exists($container_filename))
-	{
-		require($container_filename);
-		return new phpbb_cache_container();
-	}
-
 	// Create a temporary container for access to the ext.manager service
 	$tmp_container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
 	$tmp_container->compile();
@@ -102,6 +94,21 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb
 	}
 	$container->compile();
 
+	return $container;
+}
+
+function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_root_path, $php_ext)
+{
+	// Check for our cached container; if it exists, use it
+	$container_filename = phpbb_container_filename($phpbb_root_path, $php_ext);
+	if (file_exists($container_filename))
+	{
+		require($container_filename);
+		return new phpbb_cache_container();
+	}
+
+	$container = phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext);
+
 	// Lastly, we create our cached container class
 	$dumper = new PhpDumper($container);
 	$cached_container_dump = $dumper->dump(array(
@@ -114,6 +121,15 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb
 	return $container;
 }
 
+function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext)
+{
+	if (defined('DEBUG')) {
+		return phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext);
+	}
+
+	return phpbb_create_dumped_container($extensions, $passes, $phpbb_root_path, $php_ext);
+}
+
 function phpbb_container_filename($phpbb_root_path, $php_ext)
 {
 	$filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bc45b27cdc..add59b3c85 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -117,7 +117,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat
 $phpbb_class_loader_ext->register();
 
 // Set up container
-$phpbb_container = phpbb_create_compiled_container(
+$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),