GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Media] Fix undefined variable box in imagefile.php

Browse Source
This commit is contained in:
Diogo Cordeiro 2019-07-23 22:23:54 +01:00
parent ed7a88ce66
commit 7044f0e2cf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/imagefile.php
View File

@ -578,13 +578,16 @@ class ImageFile extends MediaFile
$filename = MediaFile::decodeFilename(basename($this->filepath)); $filename = MediaFile::decodeFilename(basename($this->filepath));
// Encoding null makes the file use 'untitled', and also replaces the extension // Encoding null makes the file use 'untitled', and also replaces the extension
$outfilename = MediaFile::encodeFilename($filename, $this->filehash, $ext); $outfilename = MediaFile::encodeFilename($filename, $this->filehash, $ext);
$outpath = File_thumbnail::path(
"thumb-{$this->fileRecord->id}-{$box['width']}x{$box['height']}-{$outfilename}");
// The boundary box for our resizing // The boundary box for our resizing
$box = array('width'=>$width, 'height'=>$height, $box = [
'x'=>$x, 'y'=>$y, 'width'=>$width, 'height'=>$height,
'w'=>$w, 'h'=>$h); 'x'=>$x, 'y'=>$y,
'w'=>$w, 'h'=>$h
];
$outpath = File_thumbnail::path(
"thumb-{$this->fileRecord->id}-{$box['width']}x{$box['height']}-{$outfilename}");
// Doublecheck that parameters are sane and integers. // Doublecheck that parameters are sane and integers.
if ($box['width'] < 1 || $box['width'] > common_config('thumbnail', 'maxsize') if ($box['width'] < 1 || $box['width'] > common_config('thumbnail', 'maxsize')