mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Remove trailing whitespace from avatar code

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander
2013-02-19 12:30:14 +01:00
parent 2302cd7a42
commit a9e0aea4b1
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/avatar/driver/gravatar.php
View File

@@ -37,7 +37,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
'height' => $row['avatar_height'],
);
}
/**
* @inheritdoc
*/
@@ -126,7 +126,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
$error[] = 'AVATAR_NO_SIZE';
return false;
}
if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
{
if ($row['avatar_width'] > $this->config['avatar_max_width'] || $row['avatar_height'] > $this->config['avatar_max_height'])

10
phpBB/includes/avatar/driver/interface.php
View File

@@ -31,7 +31,7 @@ interface phpbb_avatar_driver_interface
/**
* Get the avatar url and dimensions
*
* @param array $row User data or group data that has been cleaned with
* @param array $row User data or group data that has been cleaned with
* phpbb_avatar_manager::clean_row
* @return array Avatar data, must have keys src, width and height, e.g.
* ['src' => '', 'width' => 0, 'height' => 0]
@@ -42,7 +42,7 @@ interface phpbb_avatar_driver_interface
* Returns custom html if it is needed for displaying this avatar
*
* @param phpbb_user $user phpBB user object
* @param array $row User data or group data that has been cleaned with
* @param array $row User data or group data that has been cleaned with
* phpbb_avatar_manager::clean_row
* @param string $alt Alternate text for avatar image
*
@@ -56,7 +56,7 @@ interface phpbb_avatar_driver_interface
* @param phpbb_request $request Request object
* @param phpbb_template $template Template object
* @param phpbb_user $user User object
* @param array $row User data or group data that has been cleaned with
* @param array $row User data or group data that has been cleaned with
* phpbb_avatar_manager::clean_row
* @param array &$error Reference to an error array that is filled by this
* function. Key values can either be a string with a language key or
@@ -84,7 +84,7 @@ interface phpbb_avatar_driver_interface
* @param phpbb_request $request Request object
* @param phpbb_template $template Template object
* @param phpbb_user $user User object
* @param array $row User data or group data that has been cleaned with
* @param array $row User data or group data that has been cleaned with
* phpbb_avatar_manager::clean_row
* @param array &$error Reference to an error array that is filled by this
* function. Key values can either be a string with a language key or
@@ -99,7 +99,7 @@ interface phpbb_avatar_driver_interface
/**
* Delete avatar
*
* @param array $row User data or group data that has been cleaned with
* @param array $row User data or group data that has been cleaned with
* phpbb_avatar_manager::clean_row
*
* @return bool True if avatar has been deleted or there is no need to delete,

2
phpBB/includes/avatar/driver/local.php
View File

@@ -50,7 +50,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
'SELECTED' => ($cat == $category),
));
}
if ($cat != $category)
{
unset($avatar_list[$cat]);