4 files changed, 9 insertions, 15 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 2969f34b24..a55087adce 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -336,9 +336,8 @@ class acp_groups
 						// Handle avatar
 						$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-						$avatar_delete = $request->variable('avatar_delete', '');
 
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 						{
 							$avatar = $phpbb_avatar_manager->get_driver($driver);
 							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 44e4f14ae2..823f001fe0 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1749,8 +1749,8 @@ class acp_users
 						{
 							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-							$avatar_delete = $request->variable('avatar_delete', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index df6915711c..dd03f332ff 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -523,21 +523,16 @@ class ucp_groups
 								// Handle avatar
 								$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 								$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-								$avatar_delete = $request->variable('avatar_delete', '');
-								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+
+								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 								{
 									$avatar = $phpbb_avatar_manager->get_driver($driver);
 									$result = $avatar->process_form($template, $avatar_data, $avatar_error);
 
 									if ($result && empty($avatar_error))
 									{
-										$result = array(
-											'avatar_type'		=> $driver,
-											'avatar' 			=> $result['avatar'],
-											'avatar_width' 	=> $result['avatar_width'],
-											'avatar_height' 	=> $result['avatar_height'],
-										);
-										
+										$result['avatar_type'] = $driver;
+
 										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 36ac227bc8..88820beac1 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -566,8 +566,8 @@ class ucp_profile
 						{
 							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-							$avatar_delete = $request->variable('avatar_delete', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);