Merge branch 'MDL-55858-master' of git://github.com/andrewnicols/moodle

2016-10-18 17:00:21 +02:00
parent 55c7a86632 2fff69ec72
commit 0e51800e5f
1 changed files with 6 additions and 0 deletions
@@ -378,6 +378,9 @@ class forum_post implements \renderable, \templatable {
     * @return string
     */
    public function get_unsubscribeforumlink() {
+        if (!\mod_forum\subscriptions::is_subscribable($this->forum)) {
+            return null;
+        }
        $link = new \moodle_url(
            '/mod/forum/subscribe.php', array(
                'id' => $this->forum->id,
@@ -393,6 +396,9 @@ class forum_post implements \renderable, \templatable {
     * @return string
     */
    public function get_unsubscribediscussionlink() {
+        if (!\mod_forum\subscriptions::is_subscribable($this->forum)) {
+            return null;
+        }
        $link = new \moodle_url(
            '/mod/forum/subscribe.php', array(
                'id'  => $this->forum->id,