Prevent glossary etc from adding links to activity names that are

about to be turned into links (using <nolink> tags)

diff --git a/course/lib.php b/course/lib.php
index cbf3280e20d2eba3a490f5f86339d860a041dfa9..e3ef3825882c16926f6835ef958af0e5c87e2ef9 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -823,7 +823,7 @@ function print_section_block($heading, $course, $section, $mods, $modnames, $mod
                 }
                 $instancename = urldecode($modinfo[$modnumber]->name);
                 if (!empty($CFG->filterall)) {
-                    $instancename = filter_text($instancename, $course->id);
+                    $instancename = filter_text("<nolink>$instancename</nolink>", $course->id);
                 }
                 $linkcss = $mod->visible ? "" : " class=\"dimmed\" ";
                 if (!empty($modinfo[$modnumber]->extra)) {
@@ -915,7 +915,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                 }
                 $instancename = urldecode($modinfo[$modnumber]->name);
                 if (!empty($CFG->filterall)) {
-                    $instancename = filter_text($instancename, $course->id);
+                    $instancename = filter_text("<nolink>$instancename</nolink>", $course->id);
                 }
 
                 if (!empty($modinfo[$modnumber]->extra)) {