2 files changed, 9 insertions, 40 deletions
diff --git a/phpBB/install/module/obtain_data/module.php b/phpBB/install/module/obtain_data/module.php
index d846593315..a181c5231a 100644
--- a/phpBB/install/module/obtain_data/module.php
+++ b/phpBB/install/module/obtain_data/module.php
@@ -18,44 +18,6 @@ class module extends \phpbb\install\module_base
 	/**
 	 * {@inheritdoc}
 	 */
-	public function run()
-	{
-		// Recover install progress
-		$task_index = $this->recover_progress();
-
-		// Run until there are available resources
-		while ($this->install_config->get_time_remaining() > 0 && $this->install_config->get_memory_remaining() > 0)
-		{
-			// Check if task exists
-			if (!isset($this->task_collection[$task_index]))
-			{
-				break;
-			}
-
-			// Recover task to be executed
-			/** @var \phpbb\install\task_interface $task */
-			$task = $this->container->get($this->task_collection[$task_index]);
-
-			// Iterate to the next task
-			$task_index++;
-
-			// Check if we can run the task
-			if (!$task->is_essential() && !$task->check_requirements())
-			{
-				continue;
-			}
-
-			$task->run();
-
-			// Log install progress
-			$current_task_index = $task_index - 1;
-			$this->install_config->set_finished_task($this->task_collection[$current_task_index], $current_task_index);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
 	public function get_step_count()
 	{
 		return 0;
diff --git a/phpBB/install/module/requirements/module.php b/phpBB/install/module/requirements/module.php
index f3d1cc71ec..5de6bd70b9 100644
--- a/phpBB/install/module/requirements/module.php
+++ b/phpBB/install/module/requirements/module.php
@@ -34,8 +34,15 @@ class module extends \phpbb\install\module_base
 			}
 
 			// Recover task to be executed
-			/** @var \phpbb\install\task_interface $task */
-			$task = $this->container->get($this->task_collection[$task_index]);
+			try
+			{
+				/** @var \phpbb\install\task_interface $task */
+				$task = $this->container->get($this->task_collection[$task_index]);
+			}
+			catch (InvalidArgumentException $e)
+			{
+				throw new task_not_found_exception($this->task_collection[$task_index]);
+			}
 
 			// Iterate to the next task
 			$task_index++;