Merge "Fix warning from getimagesize called on empty files (bug #848595)"

056044c0 · Richard Mansfield · Gerrit Code Review · 3704d4a7 · f9566281 · 056044c0
Commit 056044c0 authored Sep 13, 2011 by Richard Mansfield Committed by Gerrit Code Review Sep 13, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

htdocs/lib/file.php htdocs/lib/file.php +1 -1

No files found.
--- a/htdocs/lib/file.php
+++ b/htdocs/lib/file.php
@@ -519,7 +519,7 @@ function get_dataroot_image_path($path, $id, $size=null) {

        // Image is not available in this size. If there is a base image for
        // it, we can make one however.
-        if (is_readable($originalimage)) {
+        if (is_readable($originalimage) && filesize($originalimage)) {

            $imageinfo = getimagesize($originalimage);
            $originalmimetype = $imageinfo['mime'];