Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Finally the *correct* fix for the looping problem. Thanks to Penny (M…

…erged from MOODLE_15_STABLE)
  • Loading branch information...
commit dd875f1aa2adbe7734dee33f215b6325fe51a62a 1 parent 9d866ae
patrickslee authored
Showing with 6 additions and 4 deletions.
  1. +1 −4 lib/moodlelib.php
  2. +5 −0 lib/setup.php
View
5 lib/moodlelib.php
@@ -6528,7 +6528,7 @@ function remove_dir($dir, $content_only=false) {
}
function report_session_error() {
- global $CFG, $FULLME, $SESSOIN;
+ global $CFG, $FULLME;
if (empty($CFG->lang)) {
$CFG->lang = "en";
}
@@ -6542,9 +6542,6 @@ function report_session_error() {
} else {
set_config('session_error_counter', 1);
}
- unset($_SESSION['USER']);
- unset($GLOBALS['USER']);
- unset($SESSION->session_test);
redirect($FULLME, get_string('sessionerroruser', 'error'), 2);
}
View
5 lib/setup.php
@@ -314,6 +314,11 @@ class object {};
} else {
$_COOKIE['MoodleSessionTest'.$CFG->sessioncookie] = 'error!!';
}
+ } else {
+ if (empty($_COOKIE['MoodleSessionTest'.$CFG->sessioncookie])) {
+ setcookie('MoodleSessionTest'.$CFG->sessioncookie, $_SESSION['SESSION']->session_test, 0, '/');
+ $_COOKIE['MoodleSessionTest'.$CFG->sessioncookie] = $_SESSION['SESSION']->session_test;
+ }
}
if (! isset($_SESSION['USER'])) {
$_SESSION['USER'] = new object;

0 comments on commit dd875f1

Please sign in to comment.
Something went wrong with that request. Please try again.