From b23c0f14421cedf73924a1aaaff83a16666885d1 Mon Sep 17 00:00:00 2001 From: RMcGirr83 Date: Mon, 19 Oct 2015 09:53:43 -0400 Subject: [PATCH 1/3] [ticket/14242] Fix memberlist sort method PHPBB3-14242 --- phpBB/memberlist.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 364a3cd523..b126796446 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -88,7 +88,7 @@ $submit = (isset($_POST['submit'])) ? true : false; $default_key = 'c'; $sort_key = request_var('sk', $default_key); -$sort_dir = request_var('sd', 'a'); +$sort_dir = request_var('sd', 'd'); // What do you want to do today? ... oops, I think that line is taken ... switch ($mode) @@ -1233,7 +1233,7 @@ switch ($mode) $check_params = array( 'g' => array('g', 0), 'sk' => array('sk', $default_key), - 'sd' => array('sd', 'a'), + 'sd' => array('sd', 'd'), 'form' => array('form', ''), 'field' => array('field', ''), 'select_single' => array('select_single', $select_single), @@ -1571,12 +1571,12 @@ switch ($mode) 'U_HIDE_FIND_MEMBER' => ($mode == 'searchuser' || ($mode == '' && $submit)) ? $u_hide_find_member : '', 'U_LIVE_SEARCH' => ($config['allow_live_searches']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=livesearch') : false, 'U_SORT_USERNAME' => $sort_url . '&sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_JOINED' => $sort_url . '&sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_POSTS' => $sort_url . '&sk=d&sd=' . (($sort_key == 'd' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_EMAIL' => $sort_url . '&sk=e&sd=' . (($sort_key == 'e' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_ACTIVE' => ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '', - 'U_SORT_RANK' => $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_LIST_CHAR' => $sort_url . '&sk=a&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'), + 'U_SORT_JOINED' => $sort_url . '&sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'd') ? 'a' : 'd'), + 'U_SORT_POSTS' => $sort_url . '&sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'd') ? 'a' : 'd'), + 'U_SORT_EMAIL' => $sort_url . '&sk=e&sd=' . (($sort_key == 'e' && $sort_dir == 'd') ? 'a' : 'd'), + 'U_SORT_ACTIVE' => ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd') : '', + 'U_SORT_RANK' => $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'd') ? 'a' : 'd'), + 'U_LIST_CHAR' => $sort_url . '&sk=d&sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd'), 'S_SHOW_GROUP' => ($mode == 'group') ? true : false, 'S_VIEWONLINE' => $auth->acl_get('u_viewonline'), From c1d47d9e169075c33ffb223af7000a7a81fc86bd Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Mon, 26 Oct 2015 06:31:39 -0400 Subject: [PATCH 2/3] [ticket/14242] Fix u_sort_posts to use correct sort key PHPBB3-14242 --- phpBB/memberlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index b126796446..5591670612 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1572,7 +1572,7 @@ switch ($mode) 'U_LIVE_SEARCH' => ($config['allow_live_searches']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=livesearch') : false, 'U_SORT_USERNAME' => $sort_url . '&sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'), 'U_SORT_JOINED' => $sort_url . '&sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'd') ? 'a' : 'd'), - 'U_SORT_POSTS' => $sort_url . '&sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'd') ? 'a' : 'd'), + 'U_SORT_POSTS' => $sort_url . '&sk=d&sd=' . (($sort_key == 'd' && $sort_dir == 'd') ? 'a' : 'd'), 'U_SORT_EMAIL' => $sort_url . '&sk=e&sd=' . (($sort_key == 'e' && $sort_dir == 'd') ? 'a' : 'd'), 'U_SORT_ACTIVE' => ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd') : '', 'U_SORT_RANK' => $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'd') ? 'a' : 'd'), From 21aa6cc12052d181ccf1d54b01d9b05a7842d6c8 Mon Sep 17 00:00:00 2001 From: RMcGirr83 Date: Fri, 30 Oct 2015 13:09:55 -0400 Subject: [PATCH 3/3] [ticket/14242] Revert some changes PHPBB3-14242 --- phpBB/memberlist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 5591670612..9604a5a21f 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -88,7 +88,7 @@ $submit = (isset($_POST['submit'])) ? true : false; $default_key = 'c'; $sort_key = request_var('sk', $default_key); -$sort_dir = request_var('sd', 'd'); +$sort_dir = request_var('sd', 'a'); // What do you want to do today? ... oops, I think that line is taken ... switch ($mode) @@ -1233,7 +1233,7 @@ switch ($mode) $check_params = array( 'g' => array('g', 0), 'sk' => array('sk', $default_key), - 'sd' => array('sd', 'd'), + 'sd' => array('sd', 'a'), 'form' => array('form', ''), 'field' => array('field', ''), 'select_single' => array('select_single', $select_single), @@ -1576,7 +1576,7 @@ switch ($mode) 'U_SORT_EMAIL' => $sort_url . '&sk=e&sd=' . (($sort_key == 'e' && $sort_dir == 'd') ? 'a' : 'd'), 'U_SORT_ACTIVE' => ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd') : '', 'U_SORT_RANK' => $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'd') ? 'a' : 'd'), - 'U_LIST_CHAR' => $sort_url . '&sk=d&sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd'), + 'U_LIST_CHAR' => $sort_url . '&sk=a&sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd'), 'S_SHOW_GROUP' => ($mode == 'group') ? true : false, 'S_VIEWONLINE' => $auth->acl_get('u_viewonline'),