Doesn't display discussions AND forums in the Activities

diff --git a/course/topics.php b/course/topics.php
index 346e099b2ff068da6ff2a7c4ba72148c4032467c..7863037505e91b5260bd7968a55b2881acdc84a9 100644 (file)
--- a/course/topics.php
+++ b/course/topics.php
@@ -67,9 +67,6 @@
     $modicon = array();
     if ($modtype) {
         foreach ($modtype as $modname => $modfullname) {
-            if ($modname == "discuss") {
-                continue;  // Covered by forum
-            }
             $moddata[] = "<A HREF=\"../mod/$modname/index.php?id=$course->id\">".$modfullname."s</A>";
             $modicon[] = "<IMG SRC=\"../mod/$modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"$modfullname\">";
         }

diff --git a/course/view.php b/course/view.php
index 85f5c526478263a76b176ee94efb653d23925252..a3f0fa69d8dab835269eea20fbb1ab33d871765c 100644 (file)
--- a/course/view.php
+++ b/course/view.php
@@ -50,6 +50,10 @@
             $mods[$mod->id] = $mod;
             $modtype[$mod->modname] = $mod->modfullname;
         }
+        if (isset($modtype["forum"]) and isset($modtype["discuss"])) {
+            // We only need one of them
+            unset($modtype["discuss"]);
+        }
         ksort($modtype);
     }
 

diff --git a/course/weeks.php b/course/weeks.php
index 47f03a251e069af8424cf2bee2a5c74d7a27244e..00a0d556215610e14edbd5d09dcf2411089ce5f1 100644 (file)
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -50,9 +50,6 @@
     $modicon = array();
     if ($modtype) {
         foreach ($modtype as $modname => $modfullname) {
-            if ($modname == "discuss") {
-                continue;  // Covered by forum
-            }
             $moddata[] = "<A HREF=\"../mod/$modname/index.php?id=$course->id\">".$modfullname."s</A>";
             $modicon[] = "<IMG SRC=\"../mod/$modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"$modfullname\">";
         }