Merge branch 'w49_MDL-37060_m24_sessinit' of git://github.com/skodak/…

…moodle into MOODLE_24_STABLE
moodle · Dec 11, 2012 · 1c90b99 · 1c90b99
2 parents 35cb0e4 + 8c35475
commit 1c90b99
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/sessionlib.php b/lib/sessionlib.php
@@ -41,13 +41,13 @@ function session_get_instance() {
 
     static $session = null;
 
-    if (!defined('NO_MOODLE_COOKIES')) {
-        // Moodle session was not initialised yet in lib/setup.php.
-        $session = new emergency_session();
-        return $session;
-    }
-
     if (is_null($session)) {
+        if (!defined('NO_MOODLE_COOKIES') or empty($DB)) {
+            // Moodle was not initialised properly in lib/setup.php.
+            $session = new emergency_session();
+            return $session;
+        }
+
         if (empty($CFG->sessiontimeout)) {
             $CFG->sessiontimeout = 7200;
         }