From 712bf84d1684bf3194ae15322ffb1179ebf69154 Mon Sep 17 00:00:00 2001 From: Louis Date: Thu, 5 Nov 2020 16:09:10 +0100 Subject: [PATCH] issue #1214 remove useless code removed query to get all users because it is not used in the template anymore --- admin/themes/default/template/user_list.tpl | 1 - admin/user_list.php | 29 --------------------- 2 files changed, 30 deletions(-) diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index 763d26b22..b82583385 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -29,7 +29,6 @@ let title_msg = '{'Are you sure you want to delete the user "%s"?'|@translate|es var filteredUsers = []; var nb_all_users = 0; -//var allUsers = [{$all_users}]; var selection = []; var pwg_token = "{$PWG_TOKEN}"; diff --git a/admin/user_list.php b/admin/user_list.php index c9ac4fae1..8458d0efd 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -49,35 +49,6 @@ while ($row = pwg_db_fetch_assoc($result)) $template->set_filenames(array('user_list'=>'user_list.tpl')); -$query = ' -SELECT - DISTINCT u.'.$conf['user_fields']['id'].' AS id, - u.'.$conf['user_fields']['username'].' AS username, - u.'.$conf['user_fields']['email'].' AS email, - ui.status, - ui.enabled_high, - ui.level - FROM '.USERS_TABLE.' AS u - INNER JOIN '.USER_INFOS_TABLE.' AS ui ON u.'.$conf['user_fields']['id'].' = ui.user_id - WHERE u.'.$conf['user_fields']['id'].' > 0 -;'; - -$result = pwg_query($query); -while ($row = pwg_db_fetch_assoc($result)) -{ - $users[] = $row; - $user_ids[] = $row['id']; -} - -$template->assign( - array( - 'users' => $users, - 'all_users' => join(',', $user_ids), - 'ACTIVATE_COMMENTS' => $conf['activate_comments'], - 'Double_Password' => $conf['double_password_type_in_admin'] - ) - ); - $default_user = get_default_user_info(true); $protected_users = array(