From: vyshane <vyshane>
Date: Mon, 4 Dec 2006 08:09:22 +0000 (+0000)
Subject: Merged from 1.7.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ea3caf69cd514bee8d7c34cf826efc5d4c353950;p=moodle.git

Merged from 1.7.
---

diff --git a/mod/forum/post.php b/mod/forum/post.php
index c3511590fd..4f8e98a300 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -134,6 +134,8 @@
         }
 
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+		$modcontext = get_context_instance(CONTEXT_MODULE, $forum->id);
+
         if (! forum_user_can_post($forum)) {
             if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {  // User is a guest here!
                 $SESSION->wantsurl = $FULLME;
@@ -147,7 +149,9 @@
         if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
             if (groupmode($course, $cm)) {   // Make sure user can post here
                 $mygroupid = mygroupid($course->id);
-                if (!((empty($mygroupid) and $discussion->groupid == -1) || (ismember($discussion->groupid)/*$mygroupid == $discussion->groupid*/))) {
+                if (!((empty($mygroupid) and $discussion->groupid == -1)
+						|| (ismember($discussion->groupid)/*$mygroupid == $discussion->groupid*/)
+						|| has_capability('moodle/site:accessallgroups', $modcontext, NULL, false) )) {
                     print_error('nopostdiscussion', 'forum');
                 }
             }