Instead of using doclang, use $SESSION->lang, and make it override other

language settings.  This should fix documentation display, but also will
be how setting registration languages and login languages works

diff --git a/doc/index.php b/doc/index.php
index 66b6f81290d089c1b66c8db70c4d5290d6d82d0f..e3e07a9e4c9ae649ea50881eedf78979e38b0525 100644 (file)
--- a/doc/index.php
+++ b/doc/index.php
@@ -8,7 +8,7 @@
     optional_variable($lang, "");     // override current language
 
     if (!empty($lang)) {
-        $SESSION->doclang = $lang;
+        $SESSION->lang = $lang;
         save_session("SESSION");
     }
 

diff --git a/doc/top.php b/doc/top.php
index 5d8b4594585ee5908eaff2bb39460b0f368a8abf..1f32f4d05fd0ff8fe31c553f7d92e2ad350fec60 100644 (file)
--- a/doc/top.php
+++ b/doc/top.php
@@ -2,11 +2,7 @@
 
     require("../config.php");
 
-    if (!empty($SESSION->doclang)) {
-        $currlang = $SESSION->doclang;
-    } else {
-        $currlang = current_language();
-    }
+    $currlang = current_language();
 
     $langs = get_list_of_languages();
     $langmenu = popup_form ("$CFG->wwwroot/doc/?lang=", $langs, "chooselang", $currlang, "", "", "", true);

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index cf5708e4fd890a73af7f33142eb89cba53e2eeb7..f19b69fc26c5551e5c75cdb8306503a789242e4f 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -897,10 +897,14 @@ function clean_filename($string) {
 
 function current_language() {
 /// Returns the code for the current language
-    global $CFG, $USER;
+    global $CFG, $USER, $SESSION;
 
-    if (isset($USER->lang)) {    // User language can override site language
+    if (isset($SESSION->lang)) {    // Session language can override other settings
+        return $SESSION->lang;
+
+    } else if (isset($USER->lang)) {    // User language can override site language
         return $USER->lang;
+
     } else {
         return $CFG->lang;
     }