1 files changed, 20 insertions, 44 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 71880c2267..31b033604d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -404,7 +404,7 @@ class acp_users
 								if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
 								{
 									$phpbb_notifications = $phpbb_container->get('notification_manager');
-									$phpbb_notifications->delete_notifications('admin_activate_user', $user_row['user_id']);
+									$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);
 
 									include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
@@ -465,25 +465,9 @@ class acp_users
 								trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
 							}
 
-							$sql_ary = array(
-								'user_avatar'			=> '',
-								'user_avatar_type'		=> '',
-								'user_avatar_width'		=> 0,
-								'user_avatar_height'	=> 0,
-							);
-
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-								WHERE user_id = $user_id";
-							$db->sql_query($sql);
-
 							// Delete old avatar if present
 							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-							$driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']);
-							if ($driver)
-							{
-								$driver->delete($user_row);
-							}
+							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $phpbb_avatar_manager->clean_row($user_row, 'user'), USERS_TABLE, 'user_');
 
 							add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']);
 							add_log('user', $user_id, 'LOG_USER_DEL_AVATAR_USER');
@@ -1677,7 +1661,7 @@ class acp_users
 					${'s_sort_' . $sort_option . '_dir'} .= '</select>';
 				}
 
-				$timezone_selects = phpbb_timezone_select($user, $data['tz'], true);
+				phpbb_timezone_select($template, $user, $data['tz'], true);
 				$user_prefs_data = array(
 					'S_PREFS'			=> true,
 					'S_JABBER_DISABLED'	=> ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
@@ -1716,8 +1700,6 @@ class acp_users
 
 					'S_LANG_OPTIONS'	=> language_select($data['lang']),
 					'S_STYLE_OPTIONS'	=> style_select($data['style']),
-					'S_TZ_OPTIONS'			=> $timezone_selects['tz_select'],
-					'S_TZ_DATE_OPTIONS'		=> $timezone_selects['tz_dates'],
 				);
 
 				/**
@@ -1779,29 +1761,6 @@ class acp_users
 									trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
 								}
 							}
-							else
-							{
-								$driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']);
-								if ($driver)
-								{
-									$driver->delete($avatar_data);
-								}
-
-								// Removing the avatar
-								$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_id;
-
-								$db->sql_query($sql);
-								trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-							}
 						}
 						else
 						{
@@ -1809,6 +1768,23 @@ class acp_users
 						}
 					}
 
+					// 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))
+							);
+						}
+						else
+						{
+							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_');
+
+							trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
+						}
+					}
+
 					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
 
 					foreach ($avatar_drivers as $current_driver)