3 files changed, 3 insertions, 10 deletions
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index 6859414236..ff7e691224 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -183,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
@@ -195,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'),