Fixed a bad bug where the Recent News block wasn't obeying Groups properly.

diff --git a/course/format/social/format.php b/course/format/social/format.php
index 787144e9629f032980b19f07d50c534dec3f2173..305eeffc151d3facafc57fbbaa73eb8f64d6115a 100644 (file)
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -23,7 +23,7 @@
               $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
           } else if ($course->groupmode == SEPARATEGROUPS and $course->groupmodeforce) {
               // Show nothing
-          } else if ($currentgroup = get_current_group($course->id)) {
+          } else if ($currentgroup) {
               $moddata[]="<a title=\"$strgroupmy\" href=\"group.php?id=$course->id\">$strgroupmy</a>";
               $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
           }
@@ -87,7 +87,7 @@
           print_heading_block($headertext);
           echo "<img alt=\"\" height=7 src=\"../pix/spacer.gif\"><br>";
     
-          forum_print_latest_discussions($social->id, 10, "plain", "", false);
+          forum_print_latest_discussions($social->id, 10, "plain", "", $currentgroup);
 
       } else {
           notify("Could not find or create a social forum here");

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 634674a55ddf4458ac4c4957284d70ab6dbfc5b9..7cfbe476f46d5b28466c02a7916dac0bd511df1d 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -64,7 +64,7 @@
             $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
         } else if ($course->groupmode == SEPARATEGROUPS and $course->groupmodeforce) {
             // Show nothing
-        } else if ($currentgroup = get_current_group($course->id)) {
+        } else if ($currentgroup) {
             $moddata[]="<a title=\"$strgroupmy\" href=\"group.php?id=$course->id\">$strgroupmy</a>";
             $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
         }
@@ -317,7 +317,7 @@
         if (!empty($news)) {
             print_side_block_start(get_string("latestnews"), 210, "sideblocklatestnews");
             echo "<font size=\"-2\">";
-            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "", false);
+            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "", $currentgroup);
             echo "</font>";
             print_side_block_end();
         }

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index d243ec50d689abcda1ffa2716804ffffe1d0aa15..2d6dd1eda59fbbfd8094149b69be68b25f0923b1 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -52,7 +52,7 @@
             $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
         } else if ($course->groupmode == SEPARATEGROUPS and $course->groupmodeforce) {
             // Show nothing
-        } else if ($currentgroup = get_current_group($course->id)) {
+        } else if ($currentgroup) {
             $moddata[]="<a title=\"$strgroupmy\" href=\"group.php?id=$course->id\">$strgroupmy</a>";
             $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
         }
@@ -298,7 +298,7 @@
         if (!empty($news)) {
             print_side_block_start(get_string("latestnews"), 210, "sideblocklatestnews");
             echo "<font size=\"-2\">";
-            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "", false);
+            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "", $currentgroup);
             echo "</font>";
             print_side_block_end();
         }

diff --git a/course/view.php b/course/view.php
index bc4b858c73ab3bd6cfe216b122493f6a79fa06a9..f9d8501f8f3738bcf6cc05321e7e9dcebf030227 100644 (file)
--- a/course/view.php
+++ b/course/view.php
@@ -61,6 +61,8 @@
         redirect("$CFG->wwwroot/");
     }
 
+    $currentgroup = get_current_group($course->id);
+
     $strcourse = get_string("course");
 
     $loggedinas = "<p class=\"logininfo\">".user_login_string($course, $USER)."</p>";