From f761a26e8d7c6a95d9be18ec0b8aedd3b30e769e Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Wed, 24 Sep 2008 11:41:51 +0000 Subject: [PATCH] Make pagination work again, undoing rev8830 to fix #32515 properly git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8929 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/memberlist.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 554dbfa7a3..ba56b6624a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -95,7 +95,7 @@
  • [Fix] Allow export of PM pages greater one. (#33155)
  • [Fix] Display coloured username of last poster in list of subscribed forums (prosilver).
  • [Fix] Added missing UCP language string NO_AUTH_READ_HOLD_MESSAGE.
    • -
  • [Fix] Do not jump back to page 1 when hiding member search in memberlist. (Bug #32515 - Patch by paul)
    • +
  • [Fix] Do not jump back to page 1 when hiding member search in memberlist. (Bug #32515)
  • [Fix] Correctly limit input of the users location to 100 characters in the UCP and ACP. (Bug #32655)
  • [Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)
  • [Fix] Extra slash is included in the redirect url when redirecting to the forum root directory. (Bug #33605)
    • diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e4c60d8464..1808c967fa 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1212,7 +1212,6 @@ switch ($mode) // We do not use request_var() here directly to save some calls (not all variables are set) $check_params = array( - 'start' => array('start', 0), 'g' => array('g', 0), 'sk' => array('sk', $default_key), 'sd' => array('sd', 'a'), @@ -1254,7 +1253,7 @@ switch ($mode) } } - $u_hide_find_member = append_sid("{$phpbb_root_path}memberlist.$phpEx", implode('&', $params)); + $u_hide_find_member = append_sid("{$phpbb_root_path}memberlist.$phpEx", "start=$start" . implode('&', $params)); $params[] = "mode=$mode"; $sort_params[] = "mode=$mode"; @@ -1469,7 +1468,7 @@ switch ($mode) 'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']), 'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']), - 'U_FIND_MEMBER' => ($config['load_search'] || $auth->acl_get('a_')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser') : '', + 'U_FIND_MEMBER' => ($config['load_search'] || $auth->acl_get('a_')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser' . (($start) ? "&start=$start" : '')) : '', 'U_HIDE_FIND_MEMBER' => ($mode == 'searchuser') ? $u_hide_find_member : '', 'U_SORT_USERNAME' => $sort_url . '&sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'), 'U_SORT_FROM' => $sort_url . '&sk=b&sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),