diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-11-10 18:50:36 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-11-10 18:50:36 +0000 |
| commit | 808385967ca927a89256e3897beb3dc540084c84 (patch) | |
| tree | 075a3691f092a381685d89f5f77d57790196359b /phpBB/includes | |
| parent | fe57a7983b692de98150a163f8615a21f5efe24d (diff) | |
| download | forums-808385967ca927a89256e3897beb3dc540084c84.tar forums-808385967ca927a89256e3897beb3dc540084c84.tar.gz forums-808385967ca927a89256e3897beb3dc540084c84.tar.bz2 forums-808385967ca927a89256e3897beb3dc540084c84.tar.xz forums-808385967ca927a89256e3897beb3dc540084c84.zip | |
Small things
#15068
#15060
git-svn-id: file:///svn/phpbb/trunk@8233 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 833d8e0173..a05409a007 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -43,7 +43,7 @@ class acp_users $user_id = request_var('u', 0); $action = request_var('action', ''); - $submit = (isset($_POST['update'])) ? true : false; + $submit = (isset($_POST['update']) && !isset($_POST['cancel'])) ? true : false; $form_name = 'acp_users'; add_form_key($form_name); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 1c6a4a988f..fa7025f2c2 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -370,6 +370,11 @@ function user_delete($mode, $user_id, $post_username = false) // Remove reports $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) { case 'retain': |