From 69f17a8e1262b9dfb5985ff01156dc694f44fc29 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Thu, 27 Jun 2024 11:37:15 +0700 Subject: [PATCH] Update memberlist.php --- memberlist.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/memberlist.php b/memberlist.php index 6aaac7db..edcd64da 100644 --- a/memberlist.php +++ b/memberlist.php @@ -125,10 +125,18 @@ if ($by_letter_req) $by_letter = 'others'; $letter_sql = "username REGEXP '^[!-@\\[-`].*$'"; } - else if ($letter_req = preg_replace("#[^$letters_range]#ui", '', iconv('windows-1251', 'UTF-8', $by_letter_req[0]))) + else { - $by_letter = DB()->escape($letter_req); - $letter_sql = "LOWER(username) LIKE '$by_letter%'"; + // Fix for russian letters + if (!$disable_ru_letters && !preg_match("/[a-я]/", $by_letter_req)) + { + $by_letter_req = iconv('windows-1251', 'UTF-8', $by_letter_req[0]); + } + if ($letter_req = preg_replace("#[^$letters_range]#ui", '', $by_letter_req)) + { + $by_letter = DB()->escape($letter_req); + $letter_sql = "LOWER(username) LIKE '$by_letter%'"; + } } }