Merged from 1.7.

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 722271a6b32c5dab3b241ab36040125b043cc768..d3ee4bae6d6ad811d89d5526875d1728a8a5a08b 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1124,7 +1124,8 @@ function forum_get_readable_forums($userid, $courseid=0) {
 
     $readableforums = array();
 
-    foreach($courses as $course) {
+    foreach ($courses as $course) {
+
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
 
         if (has_capability('moodle/course:viewhiddenactivities', $coursecontext)) {
@@ -1155,23 +1156,23 @@ function forum_get_readable_forums($userid, $courseid=0) {
             foreach ($forums as $forum) {
                 $forumcontext = get_context_instance(CONTEXT_MODULE, $forum->cmid);
 
-                // Evaluate groupmode.
-                $cm = new object;
-                $cm->id = $forum->cmid;
-                $cm->groupmode = $forum->cmgroupmode;
-                $forum->cmgroupmode = groupmode($course, $cm);
-
-                if ($forum->cmgroupmode == SEPARATEGROUPS
-                        && !has_capability('moodle/site:accessallgroups', $forumcontext)) {
-                    $forum->accessallgroups = false;
-                    $forum->accessgroup = $group->id;  // The user can only access
-                                                       // discussions for this group.
-                } else {
-                    $forum->accessallgroups = true;
-                }
-
                 if (has_capability('mod/forum:viewdiscussion', $forumcontext)) {
 
+                    // Evaluate groupmode.
+                    $cm = new object;
+                    $cm->id = $forum->cmid;
+                    $cm->groupmode = $forum->cmgroupmode;
+                    $forum->cmgroupmode = groupmode($course, $cm);
+
+                    if ($forum->cmgroupmode == SEPARATEGROUPS
+                            && !has_capability('moodle/site:accessallgroups', $forumcontext)) {
+                        $forum->accessallgroups = false;
+                        $forum->accessgroup = $group->id;  // The user can only access
+                                                           // discussions for this group.
+                    } else {
+                        $forum->accessallgroups = true;
+                    }
+
                     $forum->viewhiddentimedposts
                         = has_capability('mod/forum:viewhiddentimedposts', $forumcontext);
 
@@ -3126,9 +3127,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
 /// and the current user is a guest.
 
     // TODO: Add group mode in there, to test for visible group.
-    if (forum_user_can_post_discussion($forum, $currentgroup, $groupmode)
-            || (has_capability('moodle/legacy:guest', $context, NULL, false)
-            && $course->id != SITEID)) {
+    if (forum_user_can_post_discussion($forum, $currentgroup, $groupmode)) {
 
         echo '<div class="singlebutton forumaddnew">';
         echo "<form id=\"newdiscussionform\" method=\"get\" action=\"$CFG->wwwroot/mod/forum/post.php\">";