From: Michael Date: Sun, 17 May 2020 21:46:54 +0000 (+0000) Subject: Issue 8458-2: Now all unicode emojis should work X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e737eea17ddc624ec8229db2a620692de396a02f;p=friendica.git Issue 8458-2: Now all unicode emojis should work --- diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 508a325ca1..258f52523c 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1724,14 +1724,14 @@ class BBCode // Replace non graphical smilies for external posts if (!$nosmile && !$for_plaintext) { - $oldtext = $text; $text = Smilies::replace($text); - if (DI::config()->get('system', 'big_emojis') && ($simple_html != self::DIASPORA) && ($oldtext != $text)) { - $conv = html_entity_decode(str_replace([' ', "\n", "\r"], '', $text)); - // Emojis are always 4 byte Unicode characters - if (strlen($conv) / mb_strlen($conv) == 4) { - $text = '' . $text . ''; - } + } + + if (DI::config()->get('system', 'big_emojis') && ($simple_html != self::DIASPORA)) { + $conv = html_entity_decode(str_replace([' ', "\n", "\r"], '', $text)); + // Emojis are always 4 byte Unicode characters + if (strlen($conv) / mb_strlen($conv) == 4) { + $text = '' . $text . ''; } }