Merge pull request #8647 from annando/annando/issue8619

[friendica.git] / src / Content / Text / BBCode.php

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 98c1552930d702c504067218b8c822282d350965..508a325ca1bb2516db9557b268a0dda07059b107 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1724,7 +1724,15 @@ class BBCode
 
                // Replace non graphical smilies for external posts
                if (!$nosmile && !$for_plaintext) {
-                       $text = Smilies::replace($text);
+                       $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 = '<span style="font-size: xx-large; line-height: initial;">' . $text . '</span>';
+                               }
+                       }
                }
 
                if (!$for_plaintext) {