tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fix wrong code blocks escaping in Content\Smilies

Browse source
This commit is contained in:
Hypolite Petovan 2019-03-25 00:16:18 -04:00
parent 76414a5169
commit 2fb443ac3d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Content/Smilies.php
View file

@ -213,7 +213,6 @@ 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,7 +230,6 @@ 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('/<pre>(.*?)<\/pre>/ism', 'self::decode', $text);
$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text); $text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text);
return $text; return $text;
@ -244,7 +242,7 @@ class Smilies
*/ */
private static function encode($m) private static function encode($m)
{ {
return(str_replace($m[1], Strings::base64UrlEncode($m[1]), $m[0])); return '<code>' . Strings::base64UrlEncode($m[1]) . '</code>';
} }
/** /**
@ -255,7 +253,7 @@ class Smilies
*/ */
private static function decode($m) private static function decode($m)
{ {
return(str_replace($m[1], Strings::base64UrlDecode($m[1]), $m[0])); return '<code>' . Strings::base64UrlDecode($m[1]) . '</code>';
} }