Permalink
Browse files

MDL-18165 filterlib - Use one exclusive separator, instead of "." (do…

…t) to avoid saved tags to match with phrases being processed ; backported from HEAD
  • Loading branch information...
1 parent 4fb64b5 commit a69f581c0427bf6ccac4e45a088d0c948ac7415c stronk7 committed Feb 7, 2009
Showing with 9 additions and 4 deletions.
  1. +9 −4 lib/filterlib.php
View
@@ -2,6 +2,11 @@
// Contains special functions that are particularly useful to filters
+/// Define one exclusive separator that we'll use in the temp saved tags
+/// keys. It must be something rare enough to avoid having matches with
+/// filterobjects. MDL-18165
+define ('EXCL_SEPARATOR', '-%-');
+
/**
* This is just a little object to define a phrase and some instructions
* for how to process it. Filters can create an array of these to pass
@@ -271,7 +276,7 @@ function filter_remove_duplicates($linkarray) {
/**
* Extract open/lose tags and their contents to avoid being processed by filters.
* Useful to extract pieces of code like <a>...</a> tags. It returns the text
- * converted with some <#x.x#> codes replacing the extracted text. Such extracted
+ * converted with some <#xEXCL_SEPARATORx#> codes replacing the extracted text. Such extracted
* texts are returned in the ignoretags array (as values), with codes as keys.
*
* param text the text that we are filtering (in/out)
@@ -292,7 +297,7 @@ function filter_save_ignore_tags(&$text,$filterignoretagsopen,$filterignoretagsc
preg_match_all($pregexp, $text, $list_of_ignores);
foreach (array_unique($list_of_ignores[0]) as $key=>$value) {
$prefix = (string)(count($ignoretags) + 1);
- $ignoretags['<#'.$prefix.'.'.$key.'#>'] = $value;
+ $ignoretags['<#'.$prefix.EXCL_SEPARATOR.$key.'#>'] = $value;
}
if (!empty($ignoretags)) {
$text = str_replace($ignoretags,array_keys($ignoretags),$text);
@@ -302,7 +307,7 @@ function filter_save_ignore_tags(&$text,$filterignoretagsopen,$filterignoretagsc
/**
* Extract tags (any text enclosed by < and > to avoid being processed by filters.
- * It returns the text converted with some <%x.x%> codes replacing the extracted text. Such extracted
+ * It returns the text converted with some <%xEXCL_SEPARATORx%> codes replacing the extracted text. Such extracted
* texts are returned in the tags array (as values), with codes as keys.
*
* param text the text that we are filtering (in/out)
@@ -313,7 +318,7 @@ function filter_save_tags(&$text,&$tags) {
preg_match_all('/<([^#%*].*?)>/is',$text,$list_of_newtags);
foreach (array_unique($list_of_newtags[0]) as $ntkey=>$value) {
$prefix = (string)(count($tags) + 1);
- $tags['<%'.$prefix.'.'.$ntkey.'%>'] = $value;
+ $tags['<%'.$prefix.EXCL_SEPARATOR.$ntkey.'%>'] = $value;
}
if (!empty($tags)) {
$text = str_replace($tags,array_keys($tags),$text);

0 comments on commit a69f581

Please sign in to comment.