MDL-17754 $USER object initialisation cleanup

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 69331c4d319ac1b59208bf8fd30f55804570f605..a3b434924cdcd30e588a1befab54fa894da91755 100644 (file)
--- 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;
 }