From: skodak <skodak>
Date: Fri, 2 Jan 2009 21:27:18 +0000 (+0000)
Subject: MDL-17754 $USER object initialisation cleanup
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=27df7ae8a5b16e18a190c3e7cfa0a87a8703291f;p=moodle.git

MDL-17754 $USER object initialisation cleanup
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 69331c4d31..a3b434924c 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2229,15 +2229,13 @@ function require_user_key_login($script, $instance=null) {
     }
 
 /// emulate normal session
-    $USER    = $user;
+    session_set_user($user);
 
 /// note we are not using normal login
     if (!defined('USER_KEY_LOGIN')) {
         define('USER_KEY_LOGIN', true);
     }
 
-    load_all_capabilities();
-
 /// return isntance id - it might be empty
     return $key->instance;
 }