makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16337] Fix Emoji in BBcode Helpline

Browse source 
PHPBB3-16337
This commit is contained in:
3D-I 2020-01-24 02:53:40 +01:00
parent eff3b08d49
commit 7d80314235
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_bbcodes.php
View file

@ -231,7 +231,7 @@ class acp_bbcodes
'bbcode_match' => $bbcode_match, 'bbcode_match' => $bbcode_match,
'bbcode_tpl' => $bbcode_tpl, 'bbcode_tpl' => $bbcode_tpl,
'display_on_posting' => $display_on_posting, 'display_on_posting' => $display_on_posting,
'bbcode_helpline' => $bbcode_helpline, 'bbcode_helpline' => utf8_encode_ucr($bbcode_helpline),
'first_pass_match' => $data['first_pass_match'], 'first_pass_match' => $data['first_pass_match'],
'first_pass_replace' => $data['first_pass_replace'], 'first_pass_replace' => $data['first_pass_replace'],
'second_pass_match' => $data['second_pass_match'], 'second_pass_match' => $data['second_pass_match'],

2
phpBB/includes/functions_display.php
View file

@ -1119,7 +1119,7 @@ function display_custom_bbcodes()
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),
'BBCODE_TAG' => $row['bbcode_tag'], 'BBCODE_TAG' => $row['bbcode_tag'],
'BBCODE_TAG_CLEAN' => str_replace('=', '-', $row['bbcode_tag']), 'BBCODE_TAG_CLEAN' => str_replace('=', '-', $row['bbcode_tag']),
'BBCODE_HELPLINE' => $row['bbcode_helpline'], 'BBCODE_HELPLINE' => utf8_decode_ncr($row['bbcode_helpline']),
); );
/** /**