mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-12-11 15:27:26 +13:00
commit 7a6ef4ee8f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/sessionlib.php
View File

@ -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;
}