3 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index 4aa7445d20..2082e0fd02 100644
--- a/phpBB/phpbb/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
@@ -69,6 +69,11 @@ class gravatar extends \phpbb\avatar\driver\driver
 		$row['avatar_width'] = $request->variable('avatar_gravatar_width', 0);
 		$row['avatar_height'] = $request->variable('avatar_gravatar_height', 0);
 
+		if (empty($row['avatar']))
+		{
+			return false;
+		}
+
 		if (!function_exists('validate_data'))
 		{
 			require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index ff1996854b..07b3ed59de 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -120,7 +120,6 @@ class local extends \phpbb\avatar\driver\driver
 
 		if (empty($category) || empty($file))
 		{
-			$error[] = 'NO_AVATAR_SELECTED';
 			return false;
 		}
 
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index edc5941602..e815b7a14d 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -130,7 +130,6 @@ class upload extends \phpbb\avatar\driver\driver
 		}
 		else
 		{
-			$error[] = 'NO_AVATAR_SELECTED';
 			return false;
 		}