From 5d49ff351d623542a648b855f934d00e292a7c2d Mon Sep 17 00:00:00 2001 From: poltawski <poltawski> Date: Sun, 27 Jan 2008 17:01:12 +0000 Subject: [PATCH] MDL-13149 - use correct capability checks to decide which forum subscribe links to display merged from MOODLE_19_STABLE --- mod/forum/view.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mod/forum/view.php b/mod/forum/view.php index 8a96fc7aa2..4546cf2d31 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -124,7 +124,7 @@ echo '<span class="helplink">' . get_string("forcessubscribe", 'forum') . '</span><br />'; helpbutton("subscription", $strallowchoice, "forum"); echo ' <span class="helplink">'; - if (has_capability('moodle/course:manageactivities', $context)) { + if (has_capability('mod/forum:managesubscriptions', $context)) { echo "<a title=\"$strallowchoice\" href=\"subscribe.php?id=$forum->id&force=no\">$strallowchoice</a>"; } else { echo $streveryoneisnowsubscribed; @@ -142,14 +142,18 @@ echo '<span class="helplink">' . get_string("allowsallsubscribe", 'forum') . '</span><br />'; helpbutton("subscription", $strforcesubscribe, "forum"); echo ' '; - if (has_capability('moodle/course:manageactivities', $context)) { + + if (has_capability('mod/forum:managesubscriptions', $context)) { echo "<span class=\"helplink\"><a title=\"$strforcesubscribe\" href=\"subscribe.php?id=$forum->id&force=yes\">$strforcesubscribe</a></span>"; - echo "<br />"; - echo "<span class=\"helplink\"><a href=\"subscribers.php?id=$forum->id\">$strshowsubscribers</a></span>"; } else { echo '<span class="helplink">'.$streveryonecannowchoose.'</span>'; } + if(has_capability('mod/forum:viewsubscribers', $context)){ + echo "<br />"; + echo "<span class=\"helplink\"><a href=\"subscribers.php?id=$forum->id\">$strshowsubscribers</a></span>"; + } + echo '<div class="helplink" id="subscriptionlink">', forum_get_subscribe_link($forum, $context, array('forcesubscribed' => '', 'cantsubscribe' => '')), '</div>'; } -- 2.39.5