keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7302 from friendica/revert-7286-bug/invading-smilies

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

2
src/Content/Smilies.php
View file

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