Merge pull request #8657 from MrPetovan/bug/8653-catch-template-engine-errors

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

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 258f52523c6ceccef1f3bae47f2b2ec72a5048e6..67dbe3b19aa05a3e347f0d9cb6c170a5e4e46425 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1727,10 +1727,10 @@ class BBCode
                        $text = Smilies::replace($text);                        
                }
 
-               if (DI::config()->get('system', 'big_emojis') && ($simple_html != self::DIASPORA)) {
+               if (!$for_plaintext && 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) {
+                       if (!empty($conv) && (strlen($conv) / mb_strlen($conv) == 4)) {
                                $text = '<span style="font-size: xx-large; line-height: initial;">' . $text . '</span>';
                        }
                }