Merge branch 'MDL-57246-33-forumredirect' of git://github.com/roperto/moodle

This commit is contained in:
Andrew Nicols
2017-08-22 12:26:42 +08:00
+5 -3
View File
@@ -106,13 +106,15 @@
$PAGE->add_body_class('forumtype-'.$forum->type);
$PAGE->set_heading($course->fullname);
/// Some capability checks.
// Some capability checks.
$courselink = new moodle_url('/course/view.php', ['id' => $cm->course]);
if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) {
notice(get_string("activityiscurrentlyhidden"));
notice(get_string("activityiscurrentlyhidden"), $courselink);
}
if (!has_capability('mod/forum:viewdiscussion', $context)) {
notice(get_string('noviewdiscussionspermission', 'forum'));
notice(get_string('noviewdiscussionspermission', 'forum'), $courselink);
}
// Mark viewed and trigger the course_module_viewed event.