4 files changed, 9 insertions, 15 deletions
diff --git a/phpBB/phpbb/install/controller/archive_download.php b/phpBB/phpbb/install/controller/archive_download.php
index a0f0ba181d..eabc0a9976 100644
--- a/phpBB/phpbb/install/controller/archive_download.php
+++ b/phpBB/phpbb/install/controller/archive_download.php
@@ -46,9 +46,9 @@ class archive_download
 	 */
 	public function conflict_archive()
 	{
-		$filename = $this->installer_config->get('update_file_conflict_archive', false);
+		$filename = $this->installer_config->get('update_file_conflict_archive', '');
 
-		if (!$filename)
+		if (empty($filename))
 		{
 			throw new http_exception(404, 'URL_NOT_FOUND');
 		}
@@ -65,7 +65,7 @@ class archive_download
 	{
 		$filename = $this->installer_config->get('update_file_archive', '');
 
-		if (!$filename)
+		if (empty($filename))
 		{
 			throw new http_exception(404, 'URL_NOT_FOUND');
 		}
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index 2dad42b4b6..ff7e691224 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -160,12 +160,13 @@ class helper
 	 * Returns path from route name
 	 *
 	 * @param string	$route_name
+	 * @param array		$parameters
 	 *
 	 * @return string
 	 */
-	public function route($route_name)
+	public function route($route_name, $parameters = array())
 	{
-		$url = $this->router->generate($route_name);
+		$url = $this->router->generate($route_name, $parameters);
 
 		return $url;
 	}
@@ -182,11 +183,6 @@ class helper
 		if (!empty($submit))
 		{
 			$lang = $this->phpbb_request->variable('language', '');
-
-			if (!empty($lang))
-			{
-				$this->language_cookie = $lang;
-			}
 		}
 
 		// Retrieve language from cookie
@@ -194,10 +190,10 @@ class helper
 		if (empty($lang) && !empty($lang_cookie))
 		{
 			$lang = $lang_cookie;
-			$this->language_cookie = $lang;
 		}
 
 		$lang = (!empty($lang) && strpos($lang, '/') === false) ? $lang : null;
+		$this->language_cookie = $lang;
 
 		$this->render_language_select($lang);
 
diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php
index b987d91c6a..92506872a3 100644
--- a/phpBB/phpbb/install/controller/install.php
+++ b/phpBB/phpbb/install/controller/install.php
@@ -123,6 +123,7 @@ class install
 
 		// Set the appropriate input-output handler
 		$this->installer->set_iohandler($this->iohandler_factory->get());
+		$this->controller_helper->handle_language_select();
 
 		if ($this->request->is_ajax())
 		{
@@ -142,8 +143,6 @@ class install
 			// Determine whether the installation was started or not
 			if (true)
 			{
-				$this->controller_helper->handle_language_select();
-
 				// Set active stage
 				$this->menu_provider->set_nav_property(
 					array('install', 0, 'introduction'),
diff --git a/phpBB/phpbb/install/controller/update.php b/phpBB/phpbb/install/controller/update.php
index 9fff11cae8..6b88827940 100644
--- a/phpBB/phpbb/install/controller/update.php
+++ b/phpBB/phpbb/install/controller/update.php
@@ -122,6 +122,7 @@ class update
 
 		// Set the appropriate input-output handler
 		$this->installer->set_iohandler($this->iohandler_factory->get());
+		$this->controller_helper->handle_language_select();
 
 		// Render the intro page
 		if ($this->request->is_ajax())
@@ -140,8 +141,6 @@ class update
 		}
 		else
 		{
-			$this->controller_helper->handle_language_select();
-
 			// Set active stage
 			$this->menu_provider->set_nav_property(
 				array('update', 0, 'introduction'),