Index: mod/glossary/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/lib.php,v
retrieving revision 1.193.2.18
diff -u -r1.193.2.18 lib.php
--- mod/glossary/lib.php	8 Oct 2008 07:15:34 -0000	1.193.2.18
+++ mod/glossary/lib.php	7 Nov 2008 16:58:58 -0000
@@ -703,97 +703,19 @@
     $tags = array();
     $urls = array();
     $addrs = array();
+
+    global $GLOSSARY_EXCLUDECONCEPTS;
 
     //Calculate all the strings to be no-linked
     //First, the concept
-    $term = preg_quote(trim($entry->concept),'/');
-    $pat = '/('.$term.')/is';
-    $doNolinks[] = $pat;
+    $GLOSSARY_EXCLUDECONCEPTS=array($entry->concept);
     //Now the aliases
     if ( $aliases = get_records('glossary_alias','entryid',$entry->id) ) {
         foreach ($aliases as $alias) {
-            $term = preg_quote(trim($alias->alias),'/');
-            $pat = '/('.$term.')/is';
-            $doNolinks[] = $pat;
+            $GLOSSARY_EXCLUDECONCEPTS[]=trim($alias->alias);
         }
     }
 
-
-    //Extract <a>..><a> tags from definition
-    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) {
-        $links['<#'.$key.'#>'] = $value;
-    }
-    //Take off every link from definition
-    if ( $links ) {
-        $definition = str_replace($links,array_keys($links),$definition);
-    }
-
-
-    //Extract all tags from definition
-    preg_match_all('/(<.*?>)/is',$definition,$list_of_tags);
-
-    //Save them into tags array to use them later
-    foreach (array_unique($list_of_tags[0]) as $key=>$value) {
-        $tags['<@'.$key.'@>'] = $value;
-    }
-    //Take off every tag from definition
-    if ( $tags ) {
-        $definition = str_replace($tags,array_keys($tags),$definition);
-    }
-
-
-    //Extract all URLS with protocol (http://domain.com) from definition
-    preg_match_all('/([[:space:]]|^|\(|\[)([[:alnum:]]+):\/\/([^[:space:]]*)([[:alnum:]#?\/&=])/is',$definition,$list_of_urls);
-
-    //Save them into urls array to use them later
-    foreach (array_unique($list_of_urls[0]) as $key=>$value) {
-        $urls['<*'.$key.'*>'] = $value;
-    }
-    //Take off every url from definition
-    if ( $urls ) {
-        $definition = str_replace($urls,array_keys($urls),$definition);
-    }
-
-
-    //Extract all WEB ADDRESSES (www.domain.com) from definition
-    preg_match_all('/([[:space:]]|^|\(|\[)www\.([^[:space:]]*)([[:alnum:]#?\/&=])/is',$definition,$list_of_addresses);
-
-    //Save them into addrs array to use them later
-    foreach (array_unique($list_of_addresses[0]) as $key=>$value) {
-        $addrs['<+'.$key.'+>'] = $value;
-    }
-    //Take off every addr from definition
-    if ( $addrs ) {
-        $definition = str_replace($addrs,array_keys($addrs),$definition);
-    }
-
-
-    //Put doNolinks (concept + aliases) enclosed by <nolink> tag
-    $definition= preg_replace($doNolinks,'<span class="nolink">$1</span>',$definition);
-
-    //Restore addrs
-    if ( $addrs ) {
-        $definition = str_replace(array_keys($addrs),$addrs,$definition);
-    }
-
-    //Restore urls
-    if ( $urls ) {
-        $definition = str_replace(array_keys($urls),$urls,$definition);
-    }
-
-    //Restore tags
-    if ( $tags ) {
-        $definition = str_replace(array_keys($tags),$tags,$definition);
-    }
-
-    //Restore links
-    if ( $links ) {
-        $definition = str_replace(array_keys($links),$links,$definition);
-    }
-
     $options = new object();
     $options->para = false;
     $options->trusttext = true;
@@ -806,6 +728,10 @@
     }
 
     $text = format_text($definition, $entry->format, $options);
+
+    // Stop excluding concepts from autolinking
+    unset($GLOSSARY_EXCLUDECONCEPTS);
+
     if (!empty($entry->highlight)) {
         $text = highlight($entry->highlight, $text);
     }
Index: mod/glossary/filter.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/filter.php,v
retrieving revision 1.33.2.1
diff -u -r1.33.2.1 filter.php
--- mod/glossary/filter.php	22 Nov 2007 22:46:56 -0000	1.33.2.1
+++ mod/glossary/filter.php	7 Nov 2008 16:58:58 -0000
@@ -149,6 +149,17 @@
 
         $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!
 }