General removal of <nolink> tags for XHTML compatibility.

Moved from the glossary filter as the filter may not be enabled.

diff --git a/lib/weblib.php b/lib/weblib.php
index 8c6646b1a207fac6aa5e9555d119c55a667ef522..9efbd489318f2d7214491433765504e1f32a1fe3 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1097,6 +1097,10 @@ function filter_text($text, $courseid=NULL) {
         }
     }
 
+    /// <nolink> tags removed for XHTML compatibility
+    $text = str_replace('<nolink>', '', $text);
+    $text = str_replace('</nolink>', '', $text);
+
     return $text;
 }
 

diff --git a/mod/glossary/filter.php b/mod/glossary/filter.php
index c583876b4c611ba1236fedc24014a5c608e9dde0..59808fa07264f4513b1f8c3bfb03d82c3b21e430 100644 (file)
--- a/mod/glossary/filter.php
+++ b/mod/glossary/filter.php
@@ -108,9 +108,6 @@
                 }
             }
         }
-        /// <nolink> tags removed for XHTML compatibility
-        $text = str_replace('<nolink>', '', $text);
-        $text = str_replace('</nolink>', '', $text);
 
         return $text;
     }