bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks

Browse source 
Escape HTML pre-formatted blocks before converting smilies
This commit is contained in:
Philipp 2019-06-23 03:00:22 +02:00 committed by GitHub
commit 5306622225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Content/Smilies.php
View file

@ -213,7 +213,8 @@ class Smilies
return $text; return $text;
} }
$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $text); $text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', 'self::encode', $text);
$text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::encode', $text);
if ($no_images) { if ($no_images) {
$cleaned = ['texts' => [], 'icons' => []]; $cleaned = ['texts' => [], 'icons' => []];
@ -230,7 +231,8 @@ class Smilies
$text = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $text); $text = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $text);
$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;
} }
@ -242,7 +244,7 @@ class Smilies
*/ */
private static function encode($m) private static function encode($m)
{ {
return '<code>' . Strings::base64UrlEncode($m[1]) . '</code>'; return '<' . $m[1] . '>' . Strings::base64UrlEncode($m[2]) . '</' . $m[1] . '>';
} }
/** /**
@ -253,7 +255,7 @@ class Smilies
*/ */
private static function decode($m) private static function decode($m)
{ {
return '<code>' . Strings::base64UrlDecode($m[1]) . '</code>'; return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '</' . $m[1] . '>';
} }