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

MDL-49434 availability: Revert MDL-49418 (obsoleted by this change)

Browse Source 
This reverts commit 51fef1de35.
This commit is contained in:
sam marshall
2015-07-15 11:43:05 +01:00
parent c7b738546c
commit aad5b7f1d0
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+8 -9
View File
@@ -2807,15 +2807,6 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
}
}
// Set the global $COURSE.
// TODO MDL-49434: setting current course/cm should be after the check $cm->uservisible .
if ($cm) {
$PAGE->set_cm($cm, $course);
$PAGE->set_pagelayout('incourse');
} else if (!empty($courseorid)) {
$PAGE->set_course($course);
}
// Check visibility of activity to current user; includes visible flag, conditional availability, etc.
if ($cm && !$cm->uservisible) {
if ($preventredirect) {
@@ -2829,6 +2820,14 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
redirect($url, get_string('activityiscurrentlyhidden'));
}
// Set the global $COURSE.
if ($cm) {
$PAGE->set_cm($cm, $course);
$PAGE->set_pagelayout('incourse');
} else if (!empty($courseorid)) {
$PAGE->set_course($course);
}
// Finally access granted, update lastaccess times.
user_accesstime_log($course->id);
}