From 955b9ede33c5696173a760ea271ec32d79e843b9 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Thu, 11 Feb 2016 13:18:30 +0100
Subject: [ticket/14462] Further speed improvements

- Cache the secondary container
- Only initialize tasks/modules that are being used
- Add timeout error message in the AJAX UI

PHPBB3-14462
---
 phpBB/phpbb/install/helper/config.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/install/helper/config.php')

diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index f58925899b..94abf9ca0b 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -95,8 +95,9 @@ class config
 		$this->installer_config	= array();
 		$this->system_data		= array();
 		$this->progress_data	= array(
-			'last_task_module_name'		=> '', // Stores the service name of the latest finished module
-			'last_task_name'			=> '', // Stores the service name of the latest finished task
+			'last_task_module_neme'		=> '', // Stores the service name of the latest finished module
+			'last_task_module_index'	=> 0, // Stores the index of the latest finished module
+			'last_task_index'			=> 0, // Stores the index of the latest finished task
 			'max_task_progress'			=> 0,
 			'current_task_progress'		=> 0,
 			'_restart_points'			=> array(),
@@ -187,21 +188,23 @@ class config
 	/**
 	 * Saves the latest executed task
 	 *
-	 * @param string	$task_service_name	Name of the installer task service
+	 * @param int	$task_service_index	Index of the installer task service in the module
 	 */
-	public function set_finished_task($task_service_name)
+	public function set_finished_task($task_service_index)
 	{
-		$this->progress_data['last_task_name']	= $task_service_name;
+		$this->progress_data['last_task_index']	= $task_service_index;
 	}
 
 	/**
 	 * Set active module
 	 *
 	 * @param string	$module_service_name	Name of the installer module service
+	 * @param int		$module_service_index	Index of the installer module service
 	 */
-	public function set_active_module($module_service_name)
+	public function set_active_module($module_service_name, $module_service_index)
 	{
 		$this->progress_data['last_task_module_name']	= $module_service_name;
+		$this->progress_data['last_task_module_index']	= $module_service_index;
 	}
 
 	/**
@@ -391,6 +394,11 @@ class config
 	 */
 	public function set_finished_navigation_stage($nav_path)
 	{
+		if (isset($this->navigation_data['finished']) && in_array($nav_path, $this->navigation_data['finished']))
+		{
+			return;
+		}
+
 		$this->navigation_data['finished'][] = $nav_path;
 	}
 
-- 
cgit v1.2.1


From 7c0fb563ec995d0d1fcb24d885a7d9d18838ed9c Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 12 Feb 2016 15:38:34 +0100
Subject: [ticket/14462] Fix CS and typo

PHPBB3-14462
---
 phpBB/phpbb/install/helper/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/install/helper/config.php')

diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index 94abf9ca0b..fad6749019 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -95,7 +95,7 @@ class config
 		$this->installer_config	= array();
 		$this->system_data		= array();
 		$this->progress_data	= array(
-			'last_task_module_neme'		=> '', // Stores the service name of the latest finished module
+			'last_task_module_name'		=> '', // Stores the service name of the latest finished module
 			'last_task_module_index'	=> 0, // Stores the index of the latest finished module
 			'last_task_index'			=> 0, // Stores the index of the latest finished task
 			'max_task_progress'			=> 0,
-- 
cgit v1.2.1