From 18a63b6d7db9eccc552025c47e5a7dd96307aacc Mon Sep 17 00:00:00 2001
From: lionel-rowe <lionel.rowe@gmail.com>
Date: Wed, 13 Apr 2022 19:21:36 +0100
Subject: [PATCH] [ticket/16985] Fix MYSQLi bug - Incorrect string value for
 non-BMP chars

PHPBB3-16985
---
 phpBB/phpbb/db/driver/mysqli.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 1b7f6252f6..b2eeb67fec 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -331,7 +331,10 @@ class mysqli extends \phpbb\db\driver\mysql_base
 	*/
 	function sql_escape($msg)
 	{
-		return @mysqli_real_escape_string($this->db_connect_id, $msg);
+		return @mysqli_real_escape_string(
+			$this->db_connect_id,
+			utf8_encode_ucr($msg)
+		);
 	}
 
 	/**