MDL-23949 fixed use of invalid $USER before linked to session

2010-08-26 17:19:09 +00:00
parent 3e359a08a0
commit 492a55e7f2
1 changed files with 4 additions and 5 deletions
@@ -758,13 +758,12 @@ function session_gc() {
 * @return string
 */
 function sesskey() {
-    global $USER;
-
-    if (empty($USER->sesskey)) {
-        $USER->sesskey = random_string(10);
+    // note: do not use $USER because it may not be initialised yet
+    if (empty($_SESSION['USER']->sesskey)) {
+        $_SESSION['USER']->sesskey = random_string(10);
    }

-    return $USER->sesskey;
+    return $_SESSION['USER']->sesskey;
 }