mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/12822] Remove "None" option from avatar select boxes

Browse Source 
This option is just used for deleting avatars for which we already have
a checkbox.

PHPBB3-12822
This commit is contained in:
Marc Alexander
2014-08-07 12:21:46 +02:00
parent 9b36b5283c
commit 4f23bb711c
10 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/avatar/driver/gravatar.php
View File

@@ -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);

1
phpBB/phpbb/avatar/driver/local.php
View File

@@ -120,7 +120,6 @@ class local extends \phpbb\avatar\driver\driver
if (empty($category) || empty($file))
{
$error[] = 'NO_AVATAR_SELECTED';
return false;
}

1
phpBB/phpbb/avatar/driver/upload.php
View File

@@ -130,7 +130,6 @@ class upload extends \phpbb\avatar\driver\driver
}
else
{
$error[] = 'NO_AVATAR_SELECTED';
return false;
}