Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"
This commit is contained in:
parent
cd2f390df6
commit
1883cfba24
|
@ -213,7 +213,6 @@ class Smilies
|
||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
|
|
||||||
$text = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::encode', $text);
|
|
||||||
$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $text);
|
$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $text);
|
||||||
|
|
||||||
if ($no_images) {
|
if ($no_images) {
|
||||||
|
@ -232,7 +231,6 @@ class Smilies
|
||||||
$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
|
$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
|
||||||
|
|
||||||
$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text);
|
$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text);
|
||||||
$text = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $text);
|
|
||||||
|
|
||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue