diff --git a/admin/user_list.php b/admin/user_list.php index 79b71b87..6fadb3c1 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -39,7 +39,7 @@ user_auth_required('committee', 'admin'); require_once ('judges.inc.php'); -$show_types = get_value_from_array($_GET, 'show_types', ''); +$show_types = get_value_from_array($_GET, 'show_types'); if (user_valid_type($show_types) == false) $show_types = array('judge'); @@ -291,21 +291,21 @@ $querystr = "SELECT LEFT JOIN `users_judge` ON `users_judge`.`users_id`=`u1`.`id` LEFT JOIN `users_volunteer` ON `users_volunteer`.`users_id`=`u1`.`id` LEFT JOIN `users_fair` ON `users_fair`.`users_id`=`u1`.`id` - LEFT JOIN `users_sponsor` ON `users_sponsor`.`users_id`=`u1`.`id`\t + LEFT JOIN `users_sponsor` ON `users_sponsor`.`users_id`=`u1`.`id` WHERE u1.year=( SELECT MAX(`year`) FROM users u2 WHERE u1.uid=u2.uid ) GROUP BY uid HAVING u1.deleted='no' - ? - ? - ? + $having_year + $where_types + $where_complete ORDER BY lastname ASC, firstname ASC, year DESC"; $q = $pdo->prepare($querystr); -$q->execute([$having_year,$where_types,$where_complete]); +$q->execute(); show_pdo_errors_if_any($pdo); $num = $q->rowCount();