mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7286 from MrPetovan/bug/invading-smilies

Browse source 
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
This commit is contained in:
Michael Vogel 2019-06-22 12:51:49 +02:00 committed by GitHub
parent c86c43db31 cdd23e5b6d
commit 85772f02ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Smilies.php
View file

@ -213,6 +213,7 @@ 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) {
@ -231,6 +232,7 @@ 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;
} }