diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-18 22:20:56 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-18 22:20:56 +0100 |
| commit | 609e10238fce3ea4915c146927d2ef790c24f7eb (patch) | |
| tree | 7aae79ba1c1fad75510b0bea3bd4deff4ad2c51a /lib/private | |
| parent | 85301c8b8516a738e86bde128c1599c1060195d5 (diff) | |
| parent | 3ebb69944bd2774d2193dc225bcad447d47296d2 (diff) | |
| download | nextcloud-server-609e10238fce3ea4915c146927d2ef790c24f7eb.tar.gz nextcloud-server-609e10238fce3ea4915c146927d2ef790c24f7eb.zip | |
Merge pull request #12945 from owncloud/hhvm-image
HHVM: Do not call filesize(null), this function expects a string.
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/image.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 78cacc84452..07cfb0f72d3 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -37,7 +37,7 @@ class OC_Image { */ static public function getMimeTypeForFile($filePath) { // exif_imagetype throws "read error!" if file is less than 12 byte - if (filesize($filePath) > 11) { + if ($filePath !== null && filesize($filePath) > 11) { $imageType = exif_imagetype($filePath); } else { $imageType = false; |