Merged from MOODLE_14_STABLE - Reverting validation in current_language() due to...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 969efd1ba8a6fad0c4780a8e1a5f655dde7e0191..cbfa9e26687f30d6ebeb09d432716c39abf7e435 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3281,16 +3281,16 @@ function current_language() {
     global $CFG, $USER, $SESSION;
 
     if (!empty($CFG->courselang)) {    // Course language can override all other settings for this page
-        return clean_param($CFG->courselang, PARAM_FILE);
+        return $CFG->courselang;
 
     } else if (!empty($SESSION->lang)) {    // Session language can override other settings
-        return clean_param($SESSION->lang, PARAM_FILE);
+        return $SESSION->lang;
 
     } else if (!empty($USER->lang)) {    // User language can override site language
-        return clean_param($USER->lang, PARAM_FILE);
+        return $USER->lang;
 
     } else {
-        return clean_param($CFG->lang, PARAM_FILE);
+        return $CFG->lang;
     }
 }