MDL-8352 Fully separate CONTEXT_COURSE, SITEID from COURSE_SYSTEM - undoing my previous hack for MDL-7114
This commit is contained in:
@@ -3711,22 +3711,6 @@ function forum_add_user_default_subscriptions($userid, $context) {
|
||||
case CONTEXT_SYSTEM: // For the whole site
|
||||
if ($courses = get_records('course')) {
|
||||
foreach ($courses as $course) {
|
||||
if ($course->id == SITEID) {
|
||||
// temporary workaround for bug MDL-7114
|
||||
if ($forums = get_all_instances_in_course('forum', $course, $userid, false)) {
|
||||
foreach ($forums as $forum) {
|
||||
if ($forum->forcesubscribe != FORUM_INITIALSUBSCRIBE) {
|
||||
continue;
|
||||
}
|
||||
if ($modcontext = get_context_instance(CONTEXT_MODULE, $forum->coursemodule)) {
|
||||
if (has_capability('mod/forum:viewdiscussion', $modcontext, $userid)) {
|
||||
forum_subscribe($userid, $forum->id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
$subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
|
||||
forum_add_user_default_subscriptions($userid, $subcontext);
|
||||
}
|
||||
@@ -3736,9 +3720,6 @@ function forum_add_user_default_subscriptions($userid, $context) {
|
||||
case CONTEXT_COURSECAT: // For a whole category
|
||||
if ($courses = get_records('course', 'category', $context->instanceid)) {
|
||||
foreach ($courses as $course) {
|
||||
if ($course->id == SITEID) {
|
||||
continue; // temporary workaround for bug MDL-7114
|
||||
}
|
||||
$subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
|
||||
forum_add_user_default_subscriptions($userid, $subcontext);
|
||||
}
|
||||
@@ -3799,20 +3780,6 @@ function forum_remove_user_subscriptions($userid, $context) {
|
||||
case CONTEXT_SYSTEM: // For the whole site
|
||||
if ($courses = get_records('course')) {
|
||||
foreach ($courses as $course) {
|
||||
if ($course->id == SITEID) {
|
||||
if ($course = get_records('course', 'id', $context->instanceid)) {
|
||||
if ($forums = get_all_instances_in_course('forum', $course, $userid, true)) {
|
||||
foreach ($forums as $forum) {
|
||||
if ($modcontext = get_context_instance(CONTEXT_MODULE, $forum->coursemodule)) {
|
||||
if (!has_capability('mod/forum:viewdiscussion', $modcontext, $userid)) {
|
||||
forum_unsubscribe($userid, $forum->id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
$subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
|
||||
forum_remove_user_subscriptions($userid, $subcontext);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user