Merge branch 'wip-MDL-27899-master' of git://github.com/samhemelryk/moodle

lib/setup.php

@@ -652,9 +652,6 @@ if (isset($_SERVER['PHP_SELF'])) {
     unset($phppos);
 }
 
-// initialise ME's
-initialise_fullme();
-
 // init session prevention flag - this is defined on pages that do not want session
 if (CLI_SCRIPT) {
     // no sessions in CLI scripts possible
@@ -677,6 +674,10 @@ session_get_instance();
 $SESSION = &$_SESSION['SESSION'];
 $USER    = &$_SESSION['USER'];
 
+// initialise ME's
+// This must presently come AFTER $USER has been set up.
+initialise_fullme();
+
 // Late profiling, only happening if early one wasn't started
 if (!empty($CFG->profilingenabled)) {
     require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');