Fix A tag regex searching. MDL-15842 ; merged from 19_STABLE

diff --git a/lib/filterlib.php b/lib/filterlib.php
index 8e10caa7f5383a197b50567c56a59f68cc555207..94c410c2c941f71016044da3d3c22191151f49b1 100644 (file)
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -73,7 +73,7 @@ function filter_phrases ($text, &$link_array, $ignoretagsopen=NULL, $ignoretagsc
 /// Unless specified otherwise, we will not replace within <a></a> tags
     if ( $ignoretagsopen === NULL ) {
         //$ignoretagsopen  = array('<a(.+?)>');
-        $ignoretagsopen  = array('<a[^>]+?>');
+        $ignoretagsopen  = array('<a\s[^>]+?>');
         $ignoretagsclose = array('</a>');
     }
     

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index b070b0fd1916e4952c8443764fe49d05857e1222..aa9d3eb20579c4fbcf40e41bd2ba1e988be575d2 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -684,7 +684,7 @@ function glossary_print_entry_definition($entry) {
 
 
     //Extract <a>..><a> tags from definition
-    preg_match_all('/<a[^>]+?>(.*?)<\/a>/is',$definition,$list_of_a);
+    preg_match_all('/<a\s[^>]+?>(.*?)<\/a>/is',$definition,$list_of_a);
 
     //Save them into links array to use them later
     foreach (array_unique($list_of_a[0]) as $key=>$value) {