diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/functions.php | 1 | ||||
| -rw-r--r-- | admin/user_list.php | 4 |
2 files changed, 2 insertions, 3 deletions
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'])) { |