Solved bug 1491 in all the "linking" filters.

(http://moodle.org/bugs/bug.php?op=show&bugid=1491)
Bugfix 001

diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php
index 78c661f76299a1881a6dc3d389b982126dcd9eee..b35d748d96e57e655765fc8f8817080e75bf1a79 100644 (file)
--- a/filter/activitynames/filter.php
+++ b/filter/activitynames/filter.php
@@ -2,7 +2,7 @@
     //This function provides automatic linking to
     //activities when its name (title) is found inside every Moodle text
     //It's based in the glosssary filter by Williams Castillo
-    //Modifications by stronk7. Enjoy! :-)
+    //Modifications by stronk7.
 
     $textfilter_function='activitynames_filter';
 
@@ -84,7 +84,7 @@
 
         //Now avoid searching inside links
         $links = array();
-        preg_match_all('/<A (.+?)>(.+?)<\/A>/is',$text,$list_of_links);
+        preg_match_all('/<A[\s](.+?)>(.+?)<\/A>/is',$text,$list_of_links);
         foreach (array_unique($list_of_links[0]) as $key=>$value) {
             $links['<@'.$key.'@>'] = $value;
         }

diff --git a/mod/glossary/filter.php b/mod/glossary/filter.php
index 51da92fd4110a87b87fafdc65d7e3f3f219688e9..d8003a7b229a85123963efaac3c7f55f0cbbfe6e 100644 (file)
--- a/mod/glossary/filter.php
+++ b/mod/glossary/filter.php
@@ -164,7 +164,7 @@
 
         //Now avoid searching inside links
         $links = array();
-        preg_match_all('/<A (.+?)>(.+?)<\/A>/is',$text,$list_of_links);
+        preg_match_all('/<A[\s](.+?)>(.+?)<\/A>/is',$text,$list_of_links);
         foreach (array_unique($list_of_links[0]) as $key=>$value) {
             $links['<@'.$key.'@>'] = $value;
         }

diff --git a/mod/resource/filter.php b/mod/resource/filter.php
index 03c57669a576c83b0e9a343879089e38d73efe84..c670f403e52290dd7bce5a8767b1ff3ab2ed5fcc 100644 (file)
--- a/mod/resource/filter.php
+++ b/mod/resource/filter.php
@@ -102,7 +102,7 @@
 
         //Now avoid searching inside links
         $links = array();
-        preg_match_all('/<A (.+?)>(.+?)<\/A>/is',$text,$list_of_links);
+        preg_match_all('/<A[\s](.+?)>(.+?)<\/A>/is',$text,$list_of_links);
         foreach (array_unique($list_of_links[0]) as $key=>$value) {
             $links['<@'.$key.'@>'] = $value;
         }