diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:38:29 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:38:29 +0200 |
| commit | 837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60 (patch) | |
| tree | e858d476e5b87f678eb1b9b9c95c15a04bdfe558 /phpBB/includes/ucp/ucp_profile.php | |
| parent | f09db1a7b4d9172035a461e90ce6fa3d7b544df3 (diff) | |
| parent | bad90dafbfe8a093a518b90b82a01d4e63e757f2 (diff) | |
| download | forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar.gz forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar.bz2 forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar.xz forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
Conflicts:
phpBB/styles/subsilver2/template/ucp_groups_manage.html
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 4ff6778512..66e21a68a5 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -558,30 +558,6 @@ class ucp_profile trigger_error($message); } } - else - { - if ($driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type'])) - { - $driver->delete($avatar_data); - } - - $result = array( - 'user_avatar' => '', - 'user_avatar_type' => '', - 'user_avatar_width' => 0, - 'user_avatar_height' => 0, - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $result) . ' - WHERE user_id = ' . (int) $user->data['user_id']; - - $db->sql_query($sql); - - meta_refresh(3, $this->u_action); - $message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); - trigger_error($message); - } } else { @@ -589,6 +565,27 @@ class ucp_profile } } + // Handle deletion of avatars + if ($request->is_set_post('avatar_delete')) + { + if (!confirm_box(true)) + { + confirm_box(false, $user->lang('CONFIRM_AVATAR_DELETE'), build_hidden_fields(array( + 'avatar_delete' => true, + 'i' => $id, + 'mode' => $mode)) + ); + } + else + { + $phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_'); + + meta_refresh(3, $this->u_action); + $message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); + trigger_error($message); + } + } + $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type'])); foreach ($avatar_drivers as $current_driver) |