From: martinlanghoff Date: Thu, 27 Jan 2005 07:10:41 +0000 (+0000) Subject: Merged from MOODLE_14_STABLE - Reverting validation in current_language() due to... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=af4e9e5fd4c31e3719d633d7903729107e13989d;p=moodle.git Merged from MOODLE_14_STABLE - Reverting validation in current_language() due to performance concerns. --- diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 969efd1ba8..cbfa9e2668 100644 --- 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; } }