Merge remote-tracking branch 'upstream/develop' into annando/issue8514

This commit is contained in:
Michael 2020-05-18 21:38:17 +00:00
commit 2a56370cf4
11 changed files with 109 additions and 41 deletions

View file

@ -1724,7 +1724,15 @@ class BBCode
// Replace non graphical smilies for external posts
if (!$nosmile && !$for_plaintext) {
$text = Smilies::replace($text);
$text = Smilies::replace($text);
}
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 (!empty($conv) && (strlen($conv) / mb_strlen($conv) == 4)) {
$text = '<span style="font-size: xx-large; line-height: initial;">' . $text . '</span>';
}
}
if (!$for_plaintext) {