From af3014b4890b45eb835ad71ac34b39b322b3f649 Mon Sep 17 00:00:00 2001 From: moodler Date: Wed, 13 Apr 2005 08:27:09 +0000 Subject: [PATCH] Merged logic fix for replying from STABLE --- mod/forum/discuss.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index 11600bcefea..2fc4a0e2bb1 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -134,10 +134,12 @@ } if ($groupmode and !isteacheredit($course->id)) { // Groups must be kept separate + $mygroupid = mygroupid($course->id); + if ($groupmode == SEPARATEGROUPS) { require_login(); - if (mygroupid($course->id) == $discussion->groupid) { + if ((empty($mygroupid) and $discussion->groupid == -1) || ($mygroupid == $discussion->groupid)) { $canreply = true; } elseif ($discussion->groupid == -1) { $canreply = false; @@ -148,7 +150,7 @@ } } else if ($groupmode == VISIBLEGROUPS) { - $canreply = (mygroupid($course->id) == $discussion->groupid); + $canreply = ((empty($mygroupid) and $discussion->groupid == -1) || ($mygroupid == $discussion->groupid)); } }