From cdd23e5b6d1d5ca6af964f71cc3ba612e41375a5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 20 Jun 2019 20:22:26 -0400 Subject: [PATCH] Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray --- src/Content/Smilies.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 9fbfd2d629..041662e1eb 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -213,6 +213,7 @@ class Smilies return $text; } + $text = preg_replace_callback('/
(.*?)<\/pre>/ism', 'self::encode', $text);
 		$text = preg_replace_callback('/(.*?)<\/code>/ism', 'self::encode', $text);
 
 		if ($no_images) {
@@ -231,6 +232,7 @@ class Smilies
 		$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
 
 		$text = preg_replace_callback('/(.*?)<\/code>/ism', 'self::decode', $text);
+		$text = preg_replace_callback('/
(.*?)<\/pre>/ism', 'self::decode', $text);
 
 		return $text;
 	}