Moved session lang setting into setup.php (works on all pages)

diff --git a/index.php b/index.php
index 45b6adfd375eda46c05e2871d02a8d3e02a132e1..896c55704ce48b3041c78c0691ff20589f6e9335 100644 (file)
--- a/index.php
+++ b/index.php
@@ -23,10 +23,6 @@
         }
     }
 
-    if (isset($lang)) {
-        $SESSION->lang = $lang;
-        save_session("SESSION");
-    }
     $currlang = current_language();
     $langs = get_list_of_languages();
     $langmenu = popup_form ("$CFG->wwwroot/?lang=", $langs, "chooselang", $currlang, "", "", "", true);

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