Fix using en-GB as default language on odd cases

Fixes showing administrator side always in en-GB if $_POST has no lang key.
roland-d · Jan 21, 2016 · 22f5598 · 22f5598
1 parent 98aa6f5
commit 22f5598
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/libraries/cms/application/administrator.php b/libraries/cms/application/administrator.php
@@ -328,9 +328,13 @@ public function login($credentials, $options = array())
 
 		if (!($result instanceof Exception))
 		{
-			$lang = $this->input->getCmd('lang', 'en-GB');
-			$lang = preg_replace('/[^A-Z-]/i', '', $lang);
-			$this->setUserState('application.lang', $lang);
+			$lang = $this->input->getCmd('lang');
+
+			if (strlen($lang)>0)
+			{
+				$lang = preg_replace('/[^A-Z-]/i', '', $lang);
+				$this->setUserState('application.lang', $lang);
+			}
 
 			static::purgeMessages();
 		}