diff --git a/mod/forum/index.php b/mod/forum/index.php index 82056deb47f..49f761176a8 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -266,13 +266,9 @@ if ($generalforums) { } if ($can_subscribe) { - if ($forum->forcesubscribe != FORUM_DISALLOWSUBSCRIBE) { - $row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes, - 'unsubscribed' => $strno, 'forcesubscribed' => $stryes, - 'cantsubscribe' => '-'), false, false, true, $subscribed_forums); - } else { - $row[] = '-'; - } + $row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes, + 'unsubscribed' => $strno, 'forcesubscribed' => $stryes, + 'cantsubscribe' => '-'), false, false, true); $digestoptions_selector->url->param('id', $forum->id); if ($forum->maildigest === null) { @@ -416,13 +412,9 @@ if ($course->id != SITEID) { // Only real courses have learning forums } if ($can_subscribe) { - if ($forum->forcesubscribe != FORUM_DISALLOWSUBSCRIBE) { - $row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes, - 'unsubscribed' => $strno, 'forcesubscribed' => $stryes, - 'cantsubscribe' => '-'), false, false, true, $subscribed_forums); - } else { - $row[] = '-'; - } + $row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes, + 'unsubscribed' => $strno, 'forcesubscribed' => $stryes, + 'cantsubscribe' => '-'), false, false, true, $subscribed_forums); $digestoptions_selector->url->param('id', $forum->id); if ($forum->maildigest === null) {