From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 21 Jun 2019 00:22:26 +0000 (-0400)
Subject: Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cdd23e5b6d1d5ca6af964f71cc3ba612e41375a5;p=friendica.git

Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
---

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>(.*?)<\/pre>/ism', 'self::encode', $text);
 		$text = preg_replace_callback('/<code>(.*?)<\/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>(.*?)<\/code>/ism', 'self::decode', $text);
+		$text = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $text);
 
 		return $text;
 	}