From 42e57d4adebceef031d207196cc0d79553c86eda Mon Sep 17 00:00:00 2001
From: Roland Becker <roland@atrol.de>
Date: Thu, 8 Mar 2018 11:22:19 +0100
Subject: [PATCH] Don't store 4-byte UTF-8 characters in MySQL 3-byte utf8
 encoding

Fixes #23549
---
 core/email_queue_api.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/email_queue_api.php b/core/email_queue_api.php
index fdd66ef63d..893b3ce2ab 100644
--- a/core/email_queue_api.php
+++ b/core/email_queue_api.php
@@ -111,8 +111,9 @@ function email_queue_add( EmailData $p_email_data ) {
 	}
 
 	$c_email = $t_email_data->email;
-	$c_subject = $t_email_data->subject;
-	$c_body = $t_email_data->body;
+	# MySQL 4-bytes UTF-8 chars workaround #21101
+	$c_subject = db_mysql_fix_utf8( $t_email_data->subject );
+	$c_body = db_mysql_fix_utf8( $t_email_data->body );
 	$c_metadata = serialize( $t_email_data->metadata );
 
 	db_param_push();