mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Adding a little more checking to the session switching trap code.
I 've come across a problem where: 1. You have an "old" (say 1.3.5?) Moodle installation. 2. You are logged in as admin. 3. You suddenly switch to using a 1.5+ codebase with the SAME database, WITHOUT LOGGING OUT FIRST. In this situation, I was presented with a deadlock. I could not do anything because "my session had expired", and I could not even log OUT to clear my session. In fact it was just reloading the "session expired page" all the time. If it weren't for debug = On which causes a notice in these circumstances, it would be fracking difficult to understand what was going on. With this small addition, you can at least visit your login page and log in anew, so problem fixed. I believe this was talked about in the forums lately? Not sure. (Also merging Martin's theme standard -> standardwhite change)
This commit is contained in:
parent
7e9a11eb98
commit
34137668b5
@ -337,7 +337,7 @@ global $THEME;
|
||||
}
|
||||
|
||||
if (!isset($CFG->theme)) {
|
||||
$CFG->theme = 'standard';
|
||||
$CFG->theme = 'standardwhite';
|
||||
}
|
||||
|
||||
theme_setup(); // Sets up theme global variables
|
||||
@ -346,7 +346,7 @@ global $THEME;
|
||||
if ($SESSION != NULL) {
|
||||
if (empty($_COOKIE['MoodleSessionTest'.$CFG->sessioncookie])) {
|
||||
report_session_error();
|
||||
} else if ($_COOKIE['MoodleSessionTest'.$CFG->sessioncookie] != $SESSION->session_test) {
|
||||
} else if (isset($SESSION->session_test) && $_COOKIE['MoodleSessionTest'.$CFG->sessioncookie] != $SESSION->session_test) {
|
||||
report_session_error();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user