diff options
| author |   3D-I <480857+3D-I@users.noreply.github.com> | 2020-01-02 20:07:55 +0100 |
|---|---|---|
| committer | 3D-I <480857+3D-I@users.noreply.github.com> | 2020-01-02 20:09:32 +0100 |
| commit | b0586b4f4d2188eb995aad803722ddb25b4cc842 (patch) | |
| tree | fd231a747e9d737ce05dc1e039944710c6cfc2f0 | |
| parent | Merge branch 'prep-release-3.2.9' into 3.2.x (diff) | |
| download | phpbb-b0586b4f4d2188eb995aad803722ddb25b4cc842.tar.gz phpbb-b0586b4f4d2188eb995aad803722ddb25b4cc842.tar.bz2 phpbb-b0586b4f4d2188eb995aad803722ddb25b4cc842.zip | |
[ticket/15712] Add Emoji and rich text in PM subject
PHPBB3-15712
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 87a8c91fd2..0a40a74b9f 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -870,6 +870,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); |