From c569d0dabc0868356c2c2f6bdf796c6433756fa2 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Mon, 28 Oct 2019 21:14:57 +0100
Subject: [PATCH] [ticket/16153] Use new function

PHPBB3-16153
---
 phpBB/posting.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 5bba052a6a..9f3b26aa85 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1182,20 +1182,10 @@ if ($submit || $preview || $refresh)
 	}
 
 	/**
-	 * Replace Emojis and other 4bit UTF-8 chars, not allowed by utf8_bin MySql, to NCR.
+	 * Replace Emojis and other 4bit UTF-8 chars not allowed by MySql to UCR / NCR.
 	 * Using their Numeric Character Reference's Hexadecimal notation.
-	 * Doesn't interfere with Japanese or Cyrillic etc.
-	 *
-	 * @see https://www.w3.org/TR/xml11/
-	 * @see https://www.opentag.com/xfaq_charrep.htm
 	 */
-	if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $post_data['post_subject'], $matches))
-	{
-		foreach ($matches as $key => $emoji)
-		{
-			$post_data['post_subject'] = str_replace($emoji, utf8_encode_ncr($emoji), $post_data['post_subject']);
-		}
-	}
+	$post_data['post_subject'] = utf8_encode_ucr($post_data['post_subject']);
 
 	/**
 	 * This should never happen again.