aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
author3D-I <480857+3D-I@users.noreply.github.com>2020-01-24 04:46:37 +0100
committer3D-I <480857+3D-I@users.noreply.github.com>2020-01-24 04:46:57 +0100
commit11e2cd925ba8f86afb3fa3afaea8ee15c2df7798 (patch)
tree1b32dae41bd2a3803717fcf6a663d6ac41fbcfc7 /phpBB
parent[ticket/16337] Fix Emoji in BBcode Helpline (diff)
downloadphpbb-11e2cd925ba8f86afb3fa3afaea8ee15c2df7798.tar.gz
phpbb-11e2cd925ba8f86afb3fa3afaea8ee15c2df7798.tar.bz2
phpbb-11e2cd925ba8f86afb3fa3afaea8ee15c2df7798.zip
[ticket/16337] Fix Emoji in BBcode Helpline
PHPBB3-16337
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_display.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 34e2d4cc78..0f6efca34e 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1114,12 +1114,15 @@ function display_custom_bbcodes()
$row['bbcode_helpline'] = $user->lang[strtoupper($row['bbcode_helpline'])];
}
+ // Convert Numeric Character References to UTF-8 chars.
+ $row['bbcode_helpline'] = utf8_decode_ncr($row['bbcode_helpline']);
+
$custom_tags = array(
'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),
'BBCODE_TAG' => $row['bbcode_tag'],
'BBCODE_TAG_CLEAN' => str_replace('=', '-', $row['bbcode_tag']),
- 'BBCODE_HELPLINE' => utf8_decode_ncr($row['bbcode_helpline']),
+ 'BBCODE_HELPLINE' => $row['bbcode_helpline'],
);
/**