diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-14 16:02:09 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-14 16:02:09 -0400 |
| commit | 1891e24ea6f5b8d5944535479182e70119b2979f (patch) | |
| tree | 86a9813c014aa398fc6bb5156cbdece71a7f8bef /phpBB | |
| parent | af693493985ca32faba4850f7fe060213f404f37 (diff) | |
| parent | a0e5f833113221493540376b9b73718f7a517595 (diff) | |
| download | forums-1891e24ea6f5b8d5944535479182e70119b2979f.tar forums-1891e24ea6f5b8d5944535479182e70119b2979f.tar.gz forums-1891e24ea6f5b8d5944535479182e70119b2979f.tar.bz2 forums-1891e24ea6f5b8d5944535479182e70119b2979f.tar.xz forums-1891e24ea6f5b8d5944535479182e70119b2979f.zip | |
Merge remote-tracking branch 'upstream/pr/1570' into develop
* upstream/pr/1570:
[ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/remote.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 7da58107a1..d629a490fd 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -93,7 +93,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; |