Merge branch 'w49_MDL-37061_m24_invalidlang' of git://github.com/skodak/moodle into MOODLE_24_STABLE

2012-12-11 14:44:21 +13:00
parent eda1d3f37a 7b03292e24
commit 6d0c04c208
1 changed files with 4 additions and 0 deletions
@@ -1122,6 +1122,10 @@ function get_moodle_cookie() {
 function session_set_user($user) {
    $_SESSION['USER'] = $user;
    unset($_SESSION['USER']->description); // conserve memory
+    if (isset($_SESSION['USER']->lang)) {
+        // Make sure it is a valid lang pack name.
+        $_SESSION['USER']->lang = clean_param($_SESSION['USER']->lang, PARAM_LANG);
+    }
    sesskey(); // init session key

    if (PHPUNIT_TEST) {