diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-07 12:21:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-07 17:28:21 +0200 |
| commit | 4f23bb711ca457efba370d7ac67394e0db59b578 (patch) | |
| tree | 5b1ba64693ad0b2059d0ebd989a14605586500c7 /phpBB/phpbb/avatar | |
| parent | 9b36b5283cc29f59428206726f666554b0e0a358 (diff) | |
| download | forums-4f23bb711ca457efba370d7ac67394e0db59b578.tar forums-4f23bb711ca457efba370d7ac67394e0db59b578.tar.gz forums-4f23bb711ca457efba370d7ac67394e0db59b578.tar.bz2 forums-4f23bb711ca457efba370d7ac67394e0db59b578.tar.xz forums-4f23bb711ca457efba370d7ac67394e0db59b578.zip | |
[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
Diffstat (limited to 'phpBB/phpbb/avatar')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/gravatar.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/local.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 1 |
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; } |