3 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/module/update_database/task/update.php b/phpBB/phpbb/install/module/update_database/task/update.php
index 4b2baf2c23..d8807951d1 100644
--- a/phpBB/phpbb/install/module/update_database/task/update.php
+++ b/phpBB/phpbb/install/module/update_database/task/update.php
@@ -183,7 +183,7 @@ class update extends task_base
 			);
 		}
 
-		$this->iohandler->finish_progress('INLINE_UPDATE_SUCCESSFUL');
+		$this->iohandler->set_progress('INLINE_UPDATE_SUCCESSFUL', $migration_count);
 
 		$this->iohandler->add_success_message('INLINE_UPDATE_SUCCESSFUL');
 
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
index 5dbee6c259..f4b3870148 100644
--- a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
+++ b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
@@ -166,6 +166,7 @@ class file_check extends task_base
 		}
 
 		$this->installer_config->set('update_files', $file_update_info);
+		$this->installer_config->set('update_info', array());
 	}
 
 	/**
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 c46c05500a..329e6b9315 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
@@ -140,10 +140,14 @@ class show_file_status extends task_base
 		}
 		else
 		{
+			$this->file_updater->close();
+			$conflict_archive_path = $this->installer_config->get('update_file_conflict_archive', null);
+
 			// Remove archive
-			$this->filesystem->remove(
-				$this->installer_config->get('update_file_conflict_archive', null)
-			);
+			if ($conflict_archive_path !== null && $this->filesystem->exists($conflict_archive_path))
+			{
+				$this->filesystem->remove($conflict_archive_path);
+			}
 
 			$this->installer_config->set('update_file_conflict_archive', null);
 		}