From fdd2409930f157cc14d4b614abd7930ce57dc75e Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Sun, 29 Oct 2023 09:13:01 +0700
Subject: [PATCH] Update memberlist.php

---
 memberlist.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/memberlist.php b/memberlist.php
index 191f8fde..9344a622 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -62,16 +62,6 @@ else
 }
 $select_sort_order .= '</select>';
 
-//
-// Generate page
-//
-$template->assign_vars(array(
-	'S_MODE_SELECT'  => $select_sort_mode,
-	'S_ORDER_SELECT' => $select_sort_order,
-	'S_MODE_ACTION'  => "memberlist.php",
-	'S_USERNAME'     => $paginationusername,
-));
-
 switch( $mode )
 {
 	case 'joined':
@@ -147,11 +137,6 @@ $select_letter .= ($by_letter == 'others') ? '<b>'. $lang['OTHERS'] .'</b>&nbsp;
 $select_letter .= ':&nbsp;';
 $select_letter .= ($by_letter == 'all') ? '<b>'. $lang['ALL'] .'</b>' : '<a class="genmed" href="'. ("memberlist.php?letter=all&amp;mode=$mode&amp;order=$sort_order") .'">'. $lang['ALL'] .'</a>';
 
-$template->assign_vars(array(
-	'S_LETTER_SELECT' => $select_letter,
-	'S_LETTER_HIDDEN' => '<input type="hidden" name="letter" value="'. $by_letter .'">',
-));
-
 // per-letter selection end
 $sql = "SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email, avatar_ext_id FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")";
 if ( $username )
@@ -238,6 +223,21 @@ if ( $mode != 'topten' || $bb_cfg['topics_per_page'] < 10 )
 	DB()->sql_freeresult($result);
 }
 
+//
+// Generate page
+//
+$template->assign_vars(array(
+	'S_MODE_SELECT'  => $select_sort_mode,
+	'S_ORDER_SELECT' => $select_sort_order,
+	'S_MODE_ACTION'  => "memberlist.php?mode=$mode&amp;order=$sort_order&amp;letter=$by_letter",
+	'S_USERNAME'     => $paginationusername,
+));
+
+$template->assign_vars(array(
+	'S_LETTER_SELECT' => $select_letter,
+	'S_LETTER_HIDDEN' => '<input type="hidden" name="letter" value="'. $by_letter .'">',
+));
+
 $template->assign_vars(array(
 	'PAGE_TITLE' => $lang['MEMBERLIST'],
 ));