From: skodak <skodak>
Date: Sun, 7 Oct 2007 13:31:41 +0000 (+0000)
Subject: MDL-11304 remerging fixes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8ce8fc85fc2b373f75404dce5b33a183a6e2e813;p=moodle.git

MDL-11304 remerging fixes
---

diff --git a/mod/forum/post.php b/mod/forum/post.php
index acc9a4f67c..4206de261a 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -141,8 +141,12 @@
         if (! $course = get_record("course", "id", $discussion->course)) {
             error("The course number was incorrect ($discussion->course)");
         }
+        if (! $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
+            error("Incorrect cm");
+        }
 
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+        $modcontext    = get_context_instance(CONTEXT_MODULE, $cm->id);
 
         if (! forum_user_can_post($forum)) {
             if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {  // User is a guest here!
@@ -154,20 +158,17 @@
             }
         }
 
-        if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-            if (groupmode($course, $cm)) {   // Make sure user can post here
-                $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-                $mygroupid = mygroupid($course->id);
-                if (!((empty($mygroupid) and $discussion->groupid == -1)
-                        || (groups_is_member($discussion->groupid)/*$mygroupid == $discussion->groupid*/)
-                        || has_capability('moodle/site:accessallgroups', $modcontext, NULL, false) )) {
-                    print_error('nopostdiscussion', 'forum');
-                }
-            }
-            if (!$cm->visible and !has_capability('moodle/course:manageactivities', $coursecontext)) {
-                error(get_string("activityiscurrentlyhidden"));
+        if (groupmode($course, $cm)) {   // Make sure user can post here
+            $mygroupid = mygroupid($course->id);
+            if (!((empty($mygroupid) and $discussion->groupid == -1)
+                    || (groups_is_member($discussion->groupid)/*$mygroupid == $discussion->groupid*/)
+                    || has_capability('moodle/site:accessallgroups', $modcontext, NULL, false) )) {
+                print_error('nopostdiscussion', 'forum');
             }
         }
+        if (!$cm->visible and !has_capability('moodle/course:manageactivities', $coursecontext)) {
+            error(get_string("activityiscurrentlyhidden"));
+        }
 
         // Load up the $post variable.