Merge pull request #12945 from owncloud/hhvm-image

HHVM: Do not call filesize(null), this function expects a string.
remotes/origin/fix-10825
Morris Jobke 10 years ago
commit 609e10238f
  1. 2
      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;

Loading…
Cancel
Save