Fix up group icon display in certain situations

diff --git a/course/format/social/format.php b/course/format/social/format.php
index 18a219da5ab235e787d5d97874f6ce7f847995ea..a7238aecc9a4841e1a98791d34eba52736e47aa3 100644 (file)
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -20,10 +20,11 @@
       if ($course->groupmode or !$course->groupmodeforce) {
           if (isteacheredit($course->id) or $course->groupmode == VISIBLEGROUPS) {
               $moddata[]="<a title=\"$strgroups\" href=\"groups.php?id=$course->id\">$strgroups</a>";
+              $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
           } else if ($currentgroup = get_current_group($course->id)) {
               $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=\"\">";
           }
-          $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
       }
 
       $fullname = fullname($USER, true);

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index e44e35104c711b9957acd265eebd5b7a4958141a..7b2eaf6fb3b417af57510af8f42f023c1d28829f 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -61,10 +61,11 @@
     if ($course->groupmode or !$course->groupmodeforce) {
         if (isteacheredit($course->id) or $course->groupmode == VISIBLEGROUPS) {
             $moddata[]="<a title=\"$strgroups\" href=\"groups.php?id=$course->id\">$strgroups</a>";
+            $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
         } else if ($currentgroup = get_current_group($course->id)) {
             $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=\"\">";
         }
-        $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
     }
 
     $fullname = fullname($USER, true);

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 084157221de7a39b85386cba9ce70954917777b6..83f68371df8f6789f57fa069967a805104816292 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -49,10 +49,11 @@
     if ($course->groupmode or !$course->groupmodeforce) {
         if (isteacheredit($course->id) or $course->groupmode == VISIBLEGROUPS) {
             $moddata[]="<a title=\"$strgroups\" href=\"groups.php?id=$course->id\">$strgroups</a>";
+            $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
         } else if ($currentgroup = get_current_group($course->id)) {
             $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=\"\">";
         }
-        $modicon[]="<img src=\"$CFG->pixpath/i/group.gif\" height=16 width=16 alt=\"\">";
     }
 
     $fullname = fullname($USER, true);