X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=074c1c53a4452e2fe63f65319bbfe96c39e900ae;hb=13eaa802e435c4f0d68ee427c3b1604a0e151858;hp=ab722df2aa3533ff5a99058473213ee771a6281e;hpb=ba99ce3d0ab77bd62971cd3962d964be1ddee205;p=friendica.git

diff --git a/index.php b/index.php
index ab722df2aa..074c1c53a4 100644
--- a/index.php
+++ b/index.php
@@ -42,6 +42,7 @@ if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 } else {
 	$lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }
+
 	
 load_translation_table($lang);
 
@@ -86,6 +87,19 @@ $a->init_pagehead();
 
 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(x($_POST,'system_language'))
+	$_SESSION['language'] = $_POST['system_language'];
+if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
+	$lang = $_SESSION['language'];
+	load_translation_table($lang);
+}
+
+
 /**
  *
  * For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header.