Commit 056044c0 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

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

parents 3704d4a7 f9566281
......@@ -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'];
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment