diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-13 09:23:38 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-13 09:23:38 +0100 |
| commit | 74cd82dff8ec2db516c2f4cc9d2a239ae421787a (patch) | |
| tree | 92c08f180a4a7a5fb70132e9981d20fdecadb40e /phpBB/memberlist.php | |
| parent | 21fe46bf8aa741b6a98c97a2a86a12b8577cd917 (diff) | |
| parent | 27cf9e490bbe48e04c73287286718a2de5dd3108 (diff) | |
| download | forums-74cd82dff8ec2db516c2f4cc9d2a239ae421787a.tar forums-74cd82dff8ec2db516c2f4cc9d2a239ae421787a.tar.gz forums-74cd82dff8ec2db516c2f4cc9d2a239ae421787a.tar.bz2 forums-74cd82dff8ec2db516c2f4cc9d2a239ae421787a.tar.xz forums-74cd82dff8ec2db516c2f4cc9d2a239ae421787a.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c4865ab3c2..c7762d4cef 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1574,12 +1574,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=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'), + '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'), |