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

This commit is contained in:
biodantas 2019-08-03 20:04:14 +00:00 committed by Gogs
commit 723f12923c

View File

@ -345,7 +345,13 @@ class ImageFile extends MediaFile
$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
$type = $this->preferredType();