From: sam_marshall <sam_marshall>
Date: Wed, 12 Nov 2008 17:00:04 +0000 (+0000)
Subject: MDL-17164: Glossary autolinking doesn't work for entries similar to current entry
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9bef587a84ac30b2fa866930ffeb446d6aa3cdfc;p=moodle.git

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 0b6fbbddb7..6c3c9eeb05 100644
--- 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 2ceea21939..fe12d72878 100644
--- 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