From: martin <martin>
Date: Sat, 20 Jul 2002 18:50:23 +0000 (+0000)
Subject: Doesn't display discussions AND forums in the Activities
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c31ebf26c7d8196f37ba51cf55ef43c5dc8af380;p=moodle.git

Doesn't display discussions AND forums in the Activities
---

diff --git a/course/topics.php b/course/topics.php
index 346e099b2f..7863037505 100644
--- 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 85f5c52647..a3f0fa69d8 100644
--- 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 47f03a251e..00a0d55621 100644
--- 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\">";
         }