eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
This commit is contained in:
Mikael Nordfeldth 2015-02-25 01:31:44 +01:00
parent 0854a84eb9
commit 4b8301d39e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/imagefile.php
View File

@ -54,7 +54,7 @@ class ImageFile
var $rotate=0; // degrees to rotate for properly oriented image (extrapolated from EXIF etc.) 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 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->id = $id;
$this->filepath = $filepath; $this->filepath = $filepath;
@ -74,9 +74,9 @@ class ImageFile
throw new UnsupportedMediaException(_('Unsupported image format.'), $this->filepath); throw new UnsupportedMediaException(_('Unsupported image format.'), $this->filepath);
} }
$this->type = ($info) ? $info[2]:$type; $this->width = $info[0];
$this->width = ($info) ? $info[0]:$width; $this->height = $info[1];
$this->height = ($info) ? $info[1]:$height; $this->type = $info[2];
if ($this->type == IMAGETYPE_JPEG && function_exists('exif_read_data')) { if ($this->type == IMAGETYPE_JPEG && function_exists('exif_read_data')) {
// Orientation value to rotate thumbnails properly // Orientation value to rotate thumbnails properly