diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-01-25 15:35:34 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-25 15:35:34 +0100 |
| commit | 4094d6261349c3a8ab2563694525885c6e116fe0 (patch) | |
| tree | d7701998ddf55a56e98e5f4ff147f48620880052 | |
| parent | Merge branch '3.2.x' into 3.3.x (diff) | |
| parent | Merge pull request #5837 from 3D-I/ticket/16337 (diff) | |
| download | phpbb-4094d6261349c3a8ab2563694525885c6e116fe0.tar.gz phpbb-4094d6261349c3a8ab2563694525885c6e116fe0.tar.bz2 phpbb-4094d6261349c3a8ab2563694525885c6e116fe0.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions_display.php | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 5e39055f50..28bb18037f 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -240,6 +240,12 @@ class acp_bbcodes 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( 'bbcode_tag' => $data['bbcode_tag'], 'bbcode_match' => $bbcode_match, diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 44478dbe49..f3f57b22f8 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1116,6 +1116,9 @@ 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), |