From ac781e570f1b4f6ecb4e54628f226e8d4757ba3e Mon Sep 17 00:00:00 2001
From: 3D-I <eataly3d@gmail.com>
Date: Tue, 13 Jul 2021 09:02:43 +0200
Subject: [PATCH 1/2] [ticket/16657] Properly decode usernames in member list
 live-search

PHPBB3-16657
---
 phpBB/memberlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 584062f0f1..482f6a3c65 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -986,7 +986,7 @@ switch ($mode)
 		{
 			$user_list[] = array(
 				'user_id'		=> (int) $row['user_id'],
-				'result'		=> $row['username'],
+				'result'		=> htmlspecialchars_decode($row['username']),
 				'username_full'	=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
 				'display'		=> get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour']),
 			);

From aecd1fa04e4c0c8d1dc3ceec1f6d7f82ab3673d5 Mon Sep 17 00:00:00 2001
From: 3D-I <eataly3d@gmail.com>
Date: Tue, 13 Jul 2021 16:05:44 +0200
Subject: [PATCH 2/2] [ticket/16657] Properly decode usernames in member list
 live-search

Housekeeping

PHPBB3-16657
---
 phpBB/memberlist.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 482f6a3c65..1acd502d4d 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -980,23 +980,26 @@ switch ($mode)
 			WHERE ' . $db->sql_in_set('user_type', $user_types) . '
 				AND username_clean ' . $db->sql_like_expression(utf8_clean_string($username_chars) . $db->get_any_char());
 		$result = $db->sql_query_limit($sql, 10);
-		$user_list = array();
+
+		$user_list = [];
 
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$user_list[] = array(
+			$user_list[] = [
 				'user_id'		=> (int) $row['user_id'],
 				'result'		=> htmlspecialchars_decode($row['username']),
 				'username_full'	=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
 				'display'		=> get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour']),
-			);
+			];
 		}
 		$db->sql_freeresult($result);
+
 		$json_response = new \phpbb\json_response();
-		$json_response->send(array(
+
+		$json_response->send([
 			'keyword' => $username_chars,
 			'results' => $user_list,
-		));
+		]);
 
 	break;