2 files changed, 44 insertions, 37 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index e4931fbe23..b9606945b4 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -471,6 +471,29 @@ class ucp_groups
 							$avatar_data = \phpbb\avatar\manager::clean_row($group_row, 'group');
 						}
 
+						// Handle deletion of avatars
+						if ($request->is_set_post('avatar_delete'))
+						{
+							if (confirm_box(true))
+							{
+								$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, GROUPS_TABLE, 'group_');
+								$cache->destroy('sql', GROUPS_TABLE);
+
+								$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
+								trigger_error($user->lang[$message] . $return_page);
+							}
+							else
+							{
+								confirm_box(false, $user->lang('CONFIRM_AVATAR_DELETE'), build_hidden_fields(array(
+										'avatar_delete'     => true,
+										'i'                 => $id,
+										'mode'              => $mode,
+										'g'			        => $group_id,
+										'action'            => $action))
+								);
+							}
+						}
+
 						// Did we submit?
 						if ($update)
 						{
@@ -510,19 +533,6 @@ class ucp_groups
 										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
-								else
-								{
-									if ($driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']))
-									{
-										$driver->delete($avatar_data);
-									}
-
-									// Removing the avatar
-									$submit_ary['avatar_type'] = '';
-									$submit_ary['avatar'] = '';
-									$submit_ary['avatar_width'] = 0;
-									$submit_ary['avatar_height'] = 0;
-								}
 
 								// Merge any avatars errors into the primary error array
 								$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
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)