Merged MDL-8741 fix from stable

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 4d11370abc962f13c4d4ac807dba99ed5de00a20..7e838640d776ab6d17824dbb756ae31c4577b048 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -169,7 +169,8 @@
     $groupmode = groupmode($course, $cm);
     
     
-    if ($groupmode and !has_capability('moodle/site:accessallgroups', $modcontext)) {   // Groups must be kept separate
+    if ($groupmode && $course->groupmodeforce && !has_capability('moodle/site:accessallgroups', $modcontext)) {   
+        // Groups must be kept separate
         //change this to ismember
         $mygroupid = mygroupid($course->id); //only useful if 0, otherwise it's an array now
         if ($groupmode == SEPARATEGROUPS) {