2 files changed, 48 insertions, 3 deletions
diff --git a/phpBB/install/helper/navigation/install_navigation.php b/phpBB/install/helper/navigation/install_navigation.php
index 3e29e55038..1389f11fa0 100644
--- a/phpBB/install/helper/navigation/install_navigation.php
+++ b/phpBB/install/helper/navigation/install_navigation.php
@@ -21,7 +21,29 @@ class install_navigation implements navigation_interface
 			'install'	=> array(
 				'label'	=> 'INSTALL',
 				'route'	=> 'phpbb_installer_install',
-				'order'	=> 0,
+				'order'	=> 1,
+				array(
+					'introduction'	=> array(
+						'label'	=> 'INTRODUCTION_TITLE',
+						'stage'	=> true,
+						'order'	=> 0,
+					),
+					'requirements'	=> array(
+						'label'	=> 'STAGE_REQUIREMENTS',
+						'stage'	=> true,
+						'order'	=> 1,
+					),
+					'obtain_data'	=> array(
+						'label'	=> 'STAGE_OBTAIN_DATA',
+						'stage'	=> true,
+						'order'	=> 2,
+					),
+					'install'	=> array(
+						'label'	=> 'STAGE_INSTALL',
+						'stage'	=> true,
+						'order'	=> 3,
+					),
+				),
 			),
 		);
 	}
diff --git a/phpBB/install/helper/navigation/navigation_provider.php b/phpBB/install/helper/navigation/navigation_provider.php
index ddb2509348..1f58cbea83 100644
--- a/phpBB/install/helper/navigation/navigation_provider.php
+++ b/phpBB/install/helper/navigation/navigation_provider.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\install\helper\navigation;
 
+use phpbb\di\service_collection;
+
 /**
  * Installers navigation provider
  */
@@ -26,9 +28,9 @@ class navigation_provider
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\di\service_collection                              $plugins
+	 * @param service_collection		$plugins
 	 */
-	public function __construct(\phpbb\di\service_collection $plugins)
+	public function __construct(service_collection $plugins)
 	{
 		$this->menu_collection	= array();
 
@@ -60,6 +62,27 @@ class navigation_provider
 	}
 
 	/**
+	 * Set a property in the navigation array
+	 *
+	 * @param array	$nav_element	Array to the navigation elem
+	 * @param array	$property_array	Array with the properties to set
+	 */
+	public function set_nav_property($nav_element, $property_array)
+	{
+		$array_pointer = array();
+		$array_root_pointer = &$array_pointer;
+		foreach ($nav_element as $array_path)
+		{
+			$array_pointer[$array_path] = array();
+			$array_pointer = &$array_pointer[$array_path];
+		}
+
+		$array_pointer = $property_array;
+
+		$this->merge($array_root_pointer, $this->menu_collection);
+	}
+
+	/**
 	 * Recursive array merge
 	 *
 	 * This function is necessary to be able to replace the options of