makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/adm/style/acp_groups.html
View file

@ -117,7 +117,6 @@
<dl> <dl>
<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> <dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true"> <dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
<option value="">{L_NO_AVATAR}</option>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option> <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->

1
phpBB/adm/style/acp_users_avatar.html
View file

@ -14,7 +14,6 @@
<dl> <dl>
<dt><label>{L_AVATAR_TYPE}</label></dt> <dt><label>{L_AVATAR_TYPE}</label></dt>
<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true"> <dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
<option value="">{L_NO_AVATAR}</option>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option> <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->

1
phpBB/language/en/common.php
View file

@ -483,7 +483,6 @@ $lang = array_merge($lang, array(
'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.',
'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.', 'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.',
'NO_AVATARS' => 'No avatars currently available', 'NO_AVATARS' => 'No avatars currently available',
'NO_AVATAR_SELECTED' => 'You have not selected any avatar.',
'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %1$s : %2$s', 'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %1$s : %2$s',
'NO_BIRTHDAYS' => 'No birthdays today', 'NO_BIRTHDAYS' => 'No birthdays today',
'NO_EMAIL_MESSAGE' => 'Email message was blank.', 'NO_EMAIL_MESSAGE' => 'Email message was blank.',

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_width'] = $request->variable('avatar_gravatar_width', 0);
$row['avatar_height'] = $request->variable('avatar_gravatar_height', 0); $row['avatar_height'] = $request->variable('avatar_gravatar_height', 0);
if (empty($row['avatar']))
{
return false;
}
if (!function_exists('validate_data')) if (!function_exists('validate_data'))
{ {
require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); 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)) if (empty($category) || empty($file))
{ {
$error[] = 'NO_AVATAR_SELECTED';
return false; return false;
} }

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

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

1
phpBB/styles/prosilver/template/ucp_avatar_options.html
View file

@ -17,7 +17,6 @@
<dl> <dl>
<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> <dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true"> <dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
<option value="">{L_NO_AVATAR}</option>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option> <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->

1
phpBB/styles/subsilver2/template/ucp_groups_manage.html
View file

@ -78,7 +78,6 @@
<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td> <td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
<td class="row2"> <td class="row2">
<select name="avatar_driver" id="avatar_driver"> <select name="avatar_driver" id="avatar_driver">
<option value="">{L_NO_AVATAR}</option>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option> <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->

1
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
View file

@ -28,7 +28,6 @@
<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td> <td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
<td class="row2"> <td class="row2">
<select name="avatar_driver" id="avatar_driver" data-togglable-settings="true"> <select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
<option value="">{L_NO_AVATAR}</option>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting=".avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option> <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting=".avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->

10
tests/functional/avatar_ucp_users_test.php
View file

@ -36,16 +36,6 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
'avatar_gravatar_height' => 80, 'avatar_gravatar_height' => 80,
), ),
), ),
// Wrong driver selected
array(
'NO_AVATAR_SELECTED',
'avatar_driver_upload',
array(
'avatar_remote_url' => 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
'avatar_remote_width' => 80,
'avatar_remote_height' => 80,
),
),
array( array(
'PROFILE_UPDATED', 'PROFILE_UPDATED',
'avatar_driver_gravatar', 'avatar_driver_gravatar',