From 2fe3a171c4adeb7777e82862933d01d917f73e4a Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 28 Oct 2014 16:15:43 +0800 Subject: [PATCH] MDL-47930 mod_forum: Display all forum statuses correctly It is possible for users with the mod/forum:managesubscriptions to subscribe to forums with subscription disabled. This is handled by forum_get_subscribe_link() already and should have been handled here all along. --- mod/forum/index.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) 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) {