From 4b8301d39e032536a7d61e92a0ea0f5b1c30af1a Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 25 Feb 2015 01:31:44 +0100 Subject: [PATCH] ImageFile constructor changed to align with existing code Noone passed type, width or height to new ImageFile(...) and in all instances, both parameters were set (though $id is null on occasion). --- lib/imagefile.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/imagefile.php b/lib/imagefile.php index fa57d524e5..f123d47485 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -54,7 +54,7 @@ class ImageFile var $rotate=0; // degrees to rotate for properly oriented image (extrapolated from EXIF etc.) var $animated = null; // Animated image? (has more than 1 frame). null means untested - function __construct($id=null, $filepath=null, $type=null, $width=null, $height=null) + function __construct($id, $filepath) { $this->id = $id; $this->filepath = $filepath; @@ -74,9 +74,9 @@ class ImageFile throw new UnsupportedMediaException(_('Unsupported image format.'), $this->filepath); } - $this->type = ($info) ? $info[2]:$type; - $this->width = ($info) ? $info[0]:$width; - $this->height = ($info) ? $info[1]:$height; + $this->width = $info[0]; + $this->height = $info[1]; + $this->type = $info[2]; if ($this->type == IMAGETYPE_JPEG && function_exists('exif_read_data')) { // Orientation value to rotate thumbnails properly -- 2.39.2