Small things

#15068
#15060


git-svn-id: file:///svn/phpbb/trunk@8233 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-11-10 18:50:36 +00:00
parent fe57a7983b
commit 808385967c
2 changed files with 6 additions and 1 deletions

View file

@ -43,7 +43,7 @@ class acp_users
$user_id = request_var('u', 0); $user_id = request_var('u', 0);
$action = request_var('action', ''); $action = request_var('action', '');
$submit = (isset($_POST['update'])) ? true : false; $submit = (isset($_POST['update']) && !isset($_POST['cancel'])) ? true : false;
$form_name = 'acp_users'; $form_name = 'acp_users';
add_form_key($form_name); add_form_key($form_name);

View file

@ -370,6 +370,11 @@ function user_delete($mode, $user_id, $post_username = false)
// Remove reports // Remove reports
$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE user_id = ' . $user_id); $db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE user_id = ' . $user_id);
if ($user_row['user_avatar'] && $user_row['user_avatar_type'] == AVATAR_UPLOAD)
{
avatar_delete('user', $user_row);
}
switch ($mode) switch ($mode)
{ {
case 'retain': case 'retain':