From 60fc8c061adbad349c3a0a365f46b37ba8339cd2 Mon Sep 17 00:00:00 2001 From: plegall Date: Sat, 17 Sep 2005 22:22:22 +0000 Subject: - improvement: add information about how to use an external table for users - bug fixed: uses user configuration fields for filtering in admin/user_list - bug fixed: don't try to create feeds automatically during sync_users (when line in user_infos is missing) - bug fixed: create_user_infos function gives status admin if user id matches $conf['webmaster_id'] git-svn-id: http://piwigo.org/svn/trunk@865 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions.php | 1 - admin/user_list.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'admin') diff --git a/admin/include/functions.php b/admin/include/functions.php index 12a032b39..5f59216bf 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1172,7 +1172,6 @@ SELECT user_id $insert['nb_line_page'] = $conf['nb_line_page']; $insert['language'] = $conf['default_language']; $insert['recent_period'] = $conf['recent_period']; - $insert['feed_id'] = find_available_feed_id(); $insert['expand'] = boolean_to_string($conf['auto_expand']); $insert['show_nb_comments'] = boolean_to_string($conf['show_nb_comments']); diff --git a/admin/user_list.php b/admin/user_list.php index 91bcfc954..0982c0f43 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -678,11 +678,11 @@ SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id, ON u.'.$conf['user_fields']['id'].' = ui.user_id LEFT JOIN '.USER_GROUP_TABLE.' AS ug ON u.'.$conf['user_fields']['id'].' = ug.user_id - WHERE id != '.$conf['guest_id']; + WHERE u.'.$conf['user_fields']['id'].' != '.$conf['guest_id']; if (isset($filter['username'])) { $query.= ' - AND username LIKE \''.$filter['username'].'\''; + AND u.'.$conf['user_fields']['username'].' LIKE \''.$filter['username'].'\''; } if (isset($filter['group'])) { -- cgit v1.2.3