L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Of $COURSE you can't redefine constants :)

Browse Source
This commit is contained in:
moodler
2006-03-29 17:56:35 +00:00
parent 20e294eeda
commit f07fa64418
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/datalib.php
+2 -1
View File
@@ -20,7 +20,6 @@ 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);
define('COURSEID', SITEID); // For now. This will usually get reset later in require_login() etc.
} else {
/**
* @ignore
@@ -29,6 +28,8 @@ if ($SITE = get_site()) {
define('COURSEID', 1);
}
$COURSE->id = SITEID; // For now. This will usually get reset later in require_login() etc.
/// FUNCTIONS FOR DATABASE HANDLING ////////////////////////////////
/**
lib/moodlelib.php
+4 -4
View File
@@ -1495,7 +1495,7 @@ function require_logout() {
* @uses $USER
* @uses $FULLME
* @uses SITEID
* @uses COURSEID
* @uses $COURSE
* @uses $MoodleSession
* @param int $courseid id of the course
* @param bool $autologinguest
@@ -1503,11 +1503,11 @@ function require_logout() {
*/
function require_login($courseid=0, $autologinguest=true, $cm=null) {
global $CFG, $SESSION, $USER, $FULLME, $MoodleSession;
global $CFG, $SESSION, $USER, $COURSE, $FULLME, $MoodleSession;
// Redefine global COURSEID, this is a new idea in 1.6 Beta and not to be relied on yet
// Redefine global $COURSE, this is a new idea in 1.6 Beta and not to be relied on yet
if ($courseid) {
define('COURSEID', $courseid);
$COURSE->id = $courseid;
}
// First check that the user is logged in to the site.