From dd875f1aa2adbe7734dee33f215b6325fe51a62a Mon Sep 17 00:00:00 2001
From: patrickslee <patrickslee>
Date: Wed, 7 Sep 2005 04:23:37 +0000
Subject: [PATCH] Finally the *correct* fix for the looping problem. Thanks to
 Penny (Merged from MOODLE_15_STABLE)

---
 lib/moodlelib.php | 5 +----
 lib/setup.php     | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 6fe39676be2..0290ccf2032 100644
--- a/lib/moodlelib.php
+++ b/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);
 }
 
diff --git a/lib/setup.php b/lib/setup.php
index 364341c1e50..47ee5b4dfe3 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -314,6 +314,11 @@ $CFG->httpswwwroot = $CFG->wwwroot;
             } 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;