MDL-17164: Glossary autolinking doesn't work for entries similar to current entry

diff --git a/mod/glossary/filter.php b/mod/glossary/filter.php
index 0b6fbbddb76d86405d932bb8cb8aa9d5954b6372..6c3c9eeb05d320bcf606509b9ba2ac63ca1765cd 100644 (file)
--- a/mod/glossary/filter.php
+++ b/mod/glossary/filter.php
@@ -143,6 +143,17 @@ function glossary_filter($courseid, $text) {
 
         $conceptlist = filter_remove_duplicates($conceptlist);
     }
+    
+    global $GLOSSARY_EXCLUDECONCEPTS;
+    if(!empty($GLOSSARY_EXCLUDECONCEPTS)) {
+        $reducedconceptlist=array();
+        foreach($conceptlist as $concept) {
+            if(!in_array($concept->phrase,$GLOSSARY_EXCLUDECONCEPTS)) {
+                $reducedconceptlist[]=$concept;
+            }
+        }
+        return filter_phrases($text, $reducedconceptlist);
+    }
 
     return filter_phrases($text, $conceptlist);   // Actually search for concepts!
 }

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 2ceea21939132ad27a0dce7a9665939e02808442..fe12d72878e78eff1a44d4feb5cde068b4778d39 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -693,11 +693,6 @@ function glossary_print_entry_definition($entry) {
         $ttpresent = false;
     }
 
-    $links = array();
-    $tags = array();
-    $urls = array();
-    $addrs = array();
-
     global $GLOSSARY_EXCLUDECONCEPTS;
 
     //Calculate all the strings to be no-linked