Avoid linking to labels and to hidden activities...

diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php
index c65ab95716e7ec57eaf410df21e8ed46efea46af..f30a72f4f36ff329c8d6f01db7964736c7512a65 100644 (file)
--- a/filter/activitynames/filter.php
+++ b/filter/activitynames/filter.php
@@ -26,15 +26,17 @@
         if (!empty($modinfo)) {
             $cm = '';
             foreach ($modinfo as $activity) {
-//echo $activity->name."-".urldecode($activity->name)."<br>";
-                $title = strip_tags(urldecode($activity->name));
-                $href_tag_begin = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/$activity->mod/view.php?id=$activity->cm\">";
-                $currentname = urldecode($activity->name);
-                if ($currentname = trim($currentname)) {
-                    //Avoid integers < 1000 to be linked. See bug 1441.
-                    $intcurrent = intval($currentname);
-                    if (!(!empty($intcurrent) && strval($intcurrent) == $currentname && $intcurrent < 1000)) {
-                        $text = activity_link_names($text,$currentname,$href_tag_begin, "</a>");
+                //Exclude labels and hidden items
+                if ($activity->mod != "label" && $activity->visible) {
+                    $title = strip_tags(urldecode($activity->name));
+                    $href_tag_begin = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/$activity->mod/view.php?id=$activity->cm\">";
+                    $currentname = urldecode($activity->name);
+                    if ($currentname = trim($currentname)) {
+                        //Avoid integers < 1000 to be linked. See bug 1441.
+                        $intcurrent = intval($currentname);
+                        if (!(!empty($intcurrent) && strval($intcurrent) == $currentname && $intcurrent < 1000)) {
+                            $text = activity_link_names($text,$currentname,$href_tag_begin, "</a>");
+                        }
                     }
                 }
             }