diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-01-20 17:25:48 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-20 17:25:48 +0100 |
| commit | 830d16943b15b63fc1a4a8537651fa4dfc54cac4 (patch) | |
| tree | 80c6e335cc7d2707f4b3d8f852d894482dcaffb9 | |
| parent | Merge pull request #5821 from marc1706/ticket/16296 (diff) | |
| parent | [ticket/15712] Add Emoji and rich text in PM Draft subject (diff) | |
| download | phpbb-830d16943b15b63fc1a4a8537651fa4dfc54cac4.tar.gz phpbb-830d16943b15b63fc1a4a8537651fa4dfc54cac4.tar.bz2 phpbb-830d16943b15b63fc1a4a8537651fa4dfc54cac4.zip | |
Merge pull request #5813 from 3D-I/ticket/15712
[ticket/15712] Fix Emoji and rich text in PM subject & draft
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 87a8c91fd2..2e1ad3fdcf 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -665,6 +665,12 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $subject = (!$subject && $action != 'post') ? $user->lang['NEW_MESSAGE'] : $subject; $message = $request->variable('message', '', true); + /** + * Replace Emojis and other 4bit UTF-8 chars not allowed by MySQL to UCR/NCR. + * Using their Numeric Character Reference's Hexadecimal notation. + */ + $subject = utf8_encode_ucr($subject); + if ($subject && $message) { if (confirm_box(true)) @@ -870,6 +876,12 @@ function compose_pm($id, $mode, $action, $user_folders = array()) 'address_list' => $address_list ); + /** + * Replace Emojis and other 4bit UTF-8 chars not allowed by MySQL to UCR/NCR. + * Using their Numeric Character Reference's Hexadecimal notation. + */ + $subject = utf8_encode_ucr($subject); + // ((!$message_subject) ? $subject : $message_subject) $msg_id = submit_pm($action, $subject, $pm_data); |