diff --git a/memberlist.php b/memberlist.php
index 9344a622..191f8fde 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -62,6 +62,16 @@ else
}
$select_sort_order .= '';
+//
+// 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':
@@ -137,6 +147,11 @@ $select_letter .= ($by_letter == 'others') ? ''. $lang['OTHERS'] .'
$select_letter .= ': ';
$select_letter .= ($by_letter == 'all') ? ''. $lang['ALL'] .'' : ''. $lang['ALL'] .'';
+$template->assign_vars(array(
+ 'S_LETTER_SELECT' => $select_letter,
+ 'S_LETTER_HIDDEN' => '',
+));
+
// 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 )
@@ -223,21 +238,6 @@ 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&order=$sort_order&letter=$by_letter",
- 'S_USERNAME' => $paginationusername,
-));
-
-$template->assign_vars(array(
- 'S_LETTER_SELECT' => $select_letter,
- 'S_LETTER_HIDDEN' => '',
-));
-
$template->assign_vars(array(
'PAGE_TITLE' => $lang['MEMBERLIST'],
));