Take session language into account when setting locale

diff --git a/lib/setup.php b/lib/setup.php
index dde729cd80007d32c778def46c662de55d688020..430a45ecbdc22ea18495f87c60c9b0151cb3c259 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -144,7 +144,9 @@
 /// then use the one from the default language.  Otherwise (and this is the 
 /// majority of cases), use the stored locale specified by admin.
 
-    if (!empty($USER->lang) and ($USER->lang != $CFG->lang) ) {
+    if (!empty($SESSION->lang) and ($SESSION->lang != $CFG->lang) ) {
+        $CFG->locale = get_string("locale");
+    } else if (!empty($USER->lang) and ($USER->lang != $CFG->lang) ) {
         $CFG->locale = get_string("locale");
     } else if (empty($CFG->locale)) {
         $CFG->locale = get_string("locale");