Merged from 1.7.

diff --git a/mod/forum/post.php b/mod/forum/post.php
index c3511590fddd658313e89759874fcf347ce79e41..4f8e98a300cea03e49cfe1c9ed8e215c46335814 100644 (file)
--- 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');
                 }
             }