3 files changed, 17 insertions, 6 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
index fed4bc101f..1797a6c9ad 100644
--- a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
+++ b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
@@ -71,6 +71,11 @@ abstract class iohandler_base implements iohandler_interface
 	protected $current_task_name;
 
 	/**
+	 * @var bool
+	 */
+	protected $restart_progress_bar;
+
+	/**
 	 * Constructor
 	 */
 	public function __construct()
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index a7d3b99dcb..e04e233a76 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -243,12 +243,18 @@ class installer
 			}
 			else
 			{
-				// Start session and try to apply session id
-				$auth = $this->container_factory->get('auth');
+				// Start session if not installing and get user object
+				// to allow redirecting to ACP
 				$user = $this->container_factory->get('user');
-				$user->session_begin();
-				$auth->acl($user->data);
-				$user->setup();
+				if (!isset($module) || !($module instanceof \phpbb\install\module\install_finish\module))
+				{
+					$auth = $this->container_factory->get('auth');
+
+					$user->session_begin();
+					$auth->acl($user->data);
+					$user->setup();
+				}
+
 				$phpbb_root_path = $this->container_factory->get_parameter('core.root_path');
 
 				$acp_url = append_sid($phpbb_root_path . 'adm/index.php', 'i=acp_help_phpbb&mode=help_phpbb', true, $user->session_id);
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
index 7f18950cf6..cf1e4cf4ac 100644
--- a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
+++ b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
@@ -92,7 +92,7 @@ class show_file_status extends task_base
 			// Create archive for merge conflicts
 			if (!empty($merge_conflicts))
 			{
-				$compression_method = $this->installer_config->get('compression_method', '');
+				$compression_method = $this->installer_config->get('file_update_compression', '');
 				$conflict_archive = $this->file_updater->init($compression_method);
 				$this->installer_config->set('update_file_conflict_archive', $conflict_archive);