2 files changed, 5 insertions, 13 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index ada1f43905..fe61c53558 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -249,7 +249,11 @@ $phpbb_style_path_provider = new phpbb_style_path_provider();
 $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context());
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 $phpbb_style->set_ext_dir_prefix('adm/');
-$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
+
+$paths = array($phpbb_admin_path . 'style', $phpbb_root_path . 'install/update/new/adm/style');
+$paths = array_filter($paths, 'is_dir');
+$phpbb_style->set_custom_style('admin', $paths, array(), '');
+
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index f9dfaaef50..478cc9f76f 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -222,12 +222,6 @@ class install_update extends module
 
 		if ($this->test_update === false)
 		{
-			// Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present
-			if (in_array($phpbb_adm_relative_path . 'style/install_update.html', $this->update_info['files']))
-			{
-				$this->tpl_name = '../../install/update/new/adm/style/install_update';
-			}
-
 			// What about the language file? Got it updated?
 			if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
 			{
@@ -1068,12 +1062,6 @@ class install_update extends module
 
 		$this->tpl_name = 'install_update_diff';
 
-		// Got the diff template itself updated? If so, we are able to directly use it
-		if (in_array($phpbb_adm_relative_path . 'style/install_update_diff.html', $this->update_info['files']))
-		{
-			$this->tpl_name = '../../install/update/new/adm/style/install_update_diff';
-		}
-
 		$this->page_title = 'VIEWING_FILE_DIFF';
 
 		$status = request_var('status', '');