Merged reply link fix from stable

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 400a379cc33eccdcb24d5789a6afa00b87386a63..cb1b4c38e2ae456ccb0b925d0509090aa98f0cba 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -188,6 +188,12 @@
             $canreply = ( (empty($mygroupid) && $discussion->groupid == -1) ||
                     (ismember($discussion->groupid) || $mygroupid == $discussion->groupid) );
         }
+    } else {
+        if (!has_capability('mod/forum:replypost', $modcontext)) {
+            if (!has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {  // User is a guest here!
+                $canreply = false;
+            }
+        }
     }