Merge remote-tracking branch 'friendika-master/master' into iconpopup

1 files changed, 14 insertions, 0 deletions

diff --git a/index.php b/index.php
index ab722df2a..074c1c53a 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);
 
@@ -87,6 +88,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.
  * Apache/PHP lumps the Link: headers into one - and other services might not be able to parse it