From: moodler <moodler>
Date: Mon, 29 May 2006 07:31:22 +0000 (+0000)
Subject: Make $COURSE a full object for later use
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=45fc1f759e99582cf81086fb350bc9969aa9d240;p=moodle.git

Make $COURSE a full object for later use
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 92994ca525..ff8d5aab13 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1505,9 +1505,12 @@ function require_login($courseid=0, $autologinguest=true, $cm=null) {
 
     global $CFG, $SESSION, $USER, $COURSE, $FULLME, $MoodleSession;
 
-    // Redefine global $COURSE, this is a new idea in 1.6 Beta and not to be relied on yet
-    if ($courseid) {
-        $COURSE->id = $courseid;
+    // Redefine global $COURSE if we can
+    global $course;  // We use the global hack once here so it doesn't need to be used again
+    if (is_object($course)) {
+        $COURSE = clone($course);
+    } else if ($courseid) {
+        $COURSE = get_record('course', 'id', $courseid);
     }
 
     // First check that the user is logged in to the site.
diff --git a/lib/setup.php b/lib/setup.php
index 07004aea8b..ff88d84fdc 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -233,7 +233,7 @@ global $HTTPSPAGEREQUIRED;
         define('COURSEID', 1);
     }
 /// And the 'default' course
-    $COURSE->id = SITEID;   // For now.  This will usually get reset later in require_login() etc.
+    $COURSE = clone($SITE);   // For now.  This will usually get reset later in require_login() etc.
 
 
 /// Set a default enrolment configuration (see bug 1598)