diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-25 01:18:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-25 01:18:27 +0100 |
| commit | ce5e2f16777ae5319fcb902ee58005a4caced7e6 (patch) | |
| tree | 0c07e0b5da060b72832eab5df4a2ae6a821b1166 /phpBB/includes/avatar | |
| parent | 7945ffa2a131c1539a4aa929039c4d44b8e4d336 (diff) | |
| download | forums-ce5e2f16777ae5319fcb902ee58005a4caced7e6.tar forums-ce5e2f16777ae5319fcb902ee58005a4caced7e6.tar.gz forums-ce5e2f16777ae5319fcb902ee58005a4caced7e6.tar.bz2 forums-ce5e2f16777ae5319fcb902ee58005a4caced7e6.tar.xz forums-ce5e2f16777ae5319fcb902ee58005a4caced7e6.zip | |
[feature/avatars] Miscellaneous fixes
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar')
| -rw-r--r-- | phpBB/includes/avatar/driver/gravatar.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/remote.php | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php index d873f7ba41..cca7289275 100644 --- a/phpBB/includes/avatar/driver/gravatar.php +++ b/phpBB/includes/avatar/driver/gravatar.php @@ -56,11 +56,10 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver */ public function get_custom_html($row, $ignore_config = false, $alt = '') { - $html = '<img src="' . $this->get_gravatar_url($row) . '" ' . + return '<img src="' . $this->get_gravatar_url($row) . '" ' . ($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') . ($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') . 'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />'; - return $html; } /** @@ -121,7 +120,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver $row['avatar_width'] = $row['avatar_height'] = min($this->config['avatar_max_width'], $this->config['avatar_max_height']); $url = $this->get_gravatar_url($row); - if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = @getimagesize($url)) === false)) + if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = getimagesize($url)) === false)) { $error[] = 'UNABLE_GET_IMAGE_SIZE'; return false; diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php index c2ae88cc02..f47b0d33f4 100644 --- a/phpBB/includes/avatar/driver/remote.php +++ b/phpBB/includes/avatar/driver/remote.php @@ -106,7 +106,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver // Make sure getimagesize works... if (function_exists('getimagesize')) { - if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false)) + if (($width <= 0 || $height <= 0) && (($image_data = getimagesize($url)) === false)) { $error[] = 'UNABLE_GET_IMAGE_SIZE'; return false; |