### Eclipse Workspace Patch 1.0 #P moodle Index: mod/glossary/filter.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/glossary/filter.php,v retrieving revision 1.33.2.2 diff -u -r1.33.2.2 filter.php --- mod/glossary/filter.php 12 Nov 2008 17:02:23 -0000 1.33.2.2 +++ mod/glossary/filter.php 24 Aug 2009 00:09:48 -0000 @@ -149,6 +149,12 @@ $conceptlist = filter_remove_duplicates($conceptlist); } + + // exclude from filtering when enclosed by the following tags + $ignoreopen = array(']*?)?>', ']*?)?>', + ']*?)?>', ']*?)?>'); + $ignoreclose = array('','', + '',''); global $GLOSSARY_EXCLUDECONCEPTS; if(!empty($GLOSSARY_EXCLUDECONCEPTS)) { @@ -158,10 +164,10 @@ $reducedconceptlist[]=$concept; } } - return filter_phrases($text, $reducedconceptlist); + return filter_phrases($text, $reducedconceptlist, $ignoreopen, $ignoreclose); } - return filter_phrases($text, $conceptlist); // Actually search for concepts! + return filter_phrases($text, $conceptlist, $ignoreopen, $ignoreclose); // Actually search for concepts! }