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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-01-25 15:35:38 +01:00
commit 28ecd3a8c0
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,6 +240,12 @@ class acp_bbcodes
trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
/**
* Replace Emojis and other 4bit UTF-8 chars not allowed by MySQL to UCR/NCR.
* Using their Numeric Character Reference's Hexadecimal notation.
*/
$bbcode_helpline = utf8_encode_ucr($bbcode_helpline);
$sql_ary = array_merge($sql_ary, array( $sql_ary = array_merge($sql_ary, array(
'bbcode_tag' => $data['bbcode_tag'], 'bbcode_tag' => $data['bbcode_tag'],
'bbcode_match' => $bbcode_match, 'bbcode_match' => $bbcode_match,

3
phpBB/includes/functions_display.php
View file

@ -1116,6 +1116,9 @@ function display_custom_bbcodes()
$row['bbcode_helpline'] = $user->lang[strtoupper($row['bbcode_helpline'])]; $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( $custom_tags = array(
'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'", 'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),