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

Merge branch 'master' of biodantas/gnu-social into master

Browse Source
This commit is contained in:
biodantas 2019-08-03 20:04:14 +00:00 committed by Gogs
commit 723f12923c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/imagefile.php
View File

@ -345,7 +345,13 @@ class ImageFile extends MediaFile
$img = $img->orientate(); $img = $img->orientate();
} }
$img->crop($box['width'], $box['height'], $box['x'], $box['y']); $img->fit($box['width'], $box['height'],
function ($constraint) {
if (common_config('attachments', 'upscale') !== true) {
$constraint->upsize(); // Prevent upscaling
}
}
);
// Ensure we save in the correct format and allow customization based on type // Ensure we save in the correct format and allow customization based on type
$type = $this->preferredType(); $type = $this->preferredType();