X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=9fe248e8e2b5329f3b67503a75c74e9a2bc6ef3b;hb=143e1a4a836e1fe4d05ab5d1c6008aa0198d2db5;hp=02316e1e952b4362a627356f6d71525884168e2a;hpb=2dd8db7de880794db10664965713f8a46581bd7a;p=friendica.git

diff --git a/index.php b/index.php
index 02316e1e95..9fe248e8e2 100644
--- a/index.php
+++ b/index.php
@@ -102,13 +102,13 @@ session_start();
  * Language was set earlier, but we can over-ride it in the session.
  * We have to do it here because the session was just now opened.
  */
-
-if(array_key_exists('system_language',$_POST)) {
-	if(strlen($_POST['system_language']))
-		$_SESSION['language'] = $_POST['system_language'];
-	else
-		unset($_SESSION['language']);
+if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
+	// we didn't loaded user data yet, but we need user language
+	$r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
+	$_SESSION['language'] = $lang;
+	if (count($r)>0) $_SESSION['language'] = $r[0]['language'];
 }
+
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	$lang = $_SESSION['language'];
 	load_translation_table($lang);