Fix wrong code blocks escaping in Content\Smilies

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 902395997835cd3becc5decb37d10ee6162d5271..9fbfd2d629c7109a4c4ca0777d393a363055c1a2 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -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) {
@@ -231,7 +230,6 @@ class Smilies
                $text = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $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);
 
                return $text;
@@ -244,7 +242,7 @@ class Smilies
         */
        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)
        {
-               return(str_replace($m[1], Strings::base64UrlDecode($m[1]), $m[0]));
+               return '<code>' . Strings::base64UrlDecode($m[1]) . '</code>';
        }