mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-05 07:48:21 +02:00
Code Issues Projects Releases Wiki Activity

MDL-27899 Moved initialise_fullme during setup to after sam has been initialised

Browse Source
This commit is contained in:
Sam Hemelryk 2011-06-20 17:40:03 +08:00
parent 7a7d34febb
commit 0ebb526f85
1 changed files with 4 additions and 3 deletions

7
lib/setup.php

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