SITE and SITEID were calculated *before* 'set names' so they weren't

fetched properly from DB. Moving such block of code from datalib.php
to setup.php to execute it *after* 'set names'. Credit goes to Skodak B-)

diff --git a/lib/datalib.php b/lib/datalib.php
index 2985bd11e6cde4c955a17b524cdcb4962cc8a575..fe4dfffa183a62b0f02c4b13b696754f313c1a85 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -15,20 +15,6 @@
 
 /// GLOBAL CONSTANTS /////////////////////////////////////////////////////////
 
-if ($SITE = get_site()) {
-    /**
-     * If $SITE global from {@link get_site()} is set then SITEID to $SITE->id, otherwise set to 1.
-     */
-    define('SITEID', $SITE->id);
-} else {
-    /**
-     * @ignore
-     */
-    define('SITEID', 1);
-    define('COURSEID', 1);
-}
-
-$COURSE->id = SITEID;   // For now.  This will usually get reset later in require_login() etc.
 
 /// FUNCTIONS FOR DATABASE HANDLING  ////////////////////////////////
 

diff --git a/lib/setup.php b/lib/setup.php
index 218b11fe67c4473b6b7ace02180e3ae6daa520cf..1cc2146cc2a9e654c077c02cf32607bb3ebcc898 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -216,6 +216,23 @@ global $HTTPSPAGEREQUIRED;
 /// work with the DB, but never before this!
 
 
+//// Defining the site
+    if ($SITE = get_site()) {
+        /**
+         * If $SITE global from {@link get_site()} is set then SITEID to $SITE->id, otherwise set to 1.
+         */
+        define('SITEID', $SITE->id);
+    } else {
+        /**
+         * @ignore
+         */
+        define('SITEID', 1);
+        define('COURSEID', 1);
+    }
+/// And the 'default' course
+    $COURSE->id = SITEID;   // For now.  This will usually get reset later in require_login() etc.
+
+
 /// Set a default enrolment configuration (see bug 1598)
     if (!isset($CFG->enrol)) {
         $CFG->enrol = 'manual';