From 4f23bb711ca457efba370d7ac67394e0db59b578 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 7 Aug 2014 12:21:46 +0200 Subject: [ticket/12822] Remove "None" option from avatar select boxes This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822 --- phpBB/phpbb/avatar/driver/gravatar.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/phpbb/avatar/driver/gravatar.php') 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); -- cgit v1.2.1