Merged from MOODLE_14_STABLE: Fixing weird forum bug to do with forum ratings (manife...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 17269044bb6241a20137000ca0a19014807b36b8..e0871dfe551bb6278258280cf4f9be4a1a5afc5f 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2199,11 +2199,11 @@ function forum_print_user_discussions($courseid, $userid, $groupid=0) {
             /// should NOT be accessible to the current user
 
             if (!$isteacheredit and $discussion->groupid != -1) {   /// Editing teachers or open discussions
-                if (!isset($cm[$discussion->forum])) {
-                    $cm[$discussion->forum] = get_coursemodule_from_instance("forum", $discussion->forum, $courseid);
-                    $groupmode[$discussion->forum] = groupmode($course, $cm[$discussion->forum]);
+                if (!isset($cm[$discussion->forumid])) {
+                    $cm[$discussion->forumid] = get_coursemodule_from_instance("forum", $discussion->forumid, $courseid);
+                    $groupmode[$discussion->forumid] = groupmode($course, $cm[$discussion->forumid]);
                 }
-                if ($groupmode[$discussion->forum] == SEPARATEGROUPS) {
+                if ($groupmode[$discussion->forumid] == SEPARATEGROUPS) {
                     if ($currentgroup != $discussion->groupid) {
                         continue;
                     }