From: moodler <moodler>
Date: Sun, 4 Mar 2007 07:35:29 +0000 (+0000)
Subject: Merged MDL-8741 fix from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b5ddfa29c7137b0330e55cef250b2b75f3dd004a;p=moodle.git

Merged MDL-8741 fix from stable
---

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 4d11370abc..7e838640d7 100644
--- 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) {