From a1c98e4012f65ca8b51ade817c3bcd2a80a7a80e Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Wed, 16 Jun 2010 16:26:31 +0000
Subject: [PATCH] Fixing login - languageselector, fixes #277

---
 lib/init.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/init.php b/lib/init.php
index 0d445678..409cceac 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -265,22 +265,30 @@ foreach($langs as $key => $value)
 	$languages[$key] = $key;
 }
 
-if(!isset($userinfo['def_language'])
-   || !isset($languages[$userinfo['def_language']]))
+if (isset($userinfo['language']))
 {
-	if(isset($_GET['language'])
-	   && isset($languages[$_GET['language']]))
-	{
-		$language = $_GET['language'];
-	}
-	else
-	{
-		$language = $settings['panel']['standardlanguage'];
-	}
+	// default: use language from session, #277
+	$language = $userinfo['language'];
 }
 else
 {
-	$language = $userinfo['def_language'];
+	if(!isset($userinfo['def_language'])
+	   || !isset($languages[$userinfo['def_language']]))
+	{
+		if(isset($_GET['language'])
+		   && isset($languages[$_GET['language']]))
+		{
+			$language = $_GET['language'];
+		}
+		else
+		{
+			$language = $settings['panel']['standardlanguage'];
+		}
+	}
+	else
+	{
+		$language = $userinfo['def_language'];
+	}
 }
 
 // include every english language file we can get