diff options
| author | icewind1991 <robin@icewind.nl> | 2014-05-05 18:24:20 +0200 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-05-05 18:24:20 +0200 |
| commit | bd92b94c6a29fca3f2a3db48a8cf34ef715188c1 (patch) | |
| tree | b97aabb3be696f609e74c135680d48c5a6b69a79 | |
| parent | 1a454f61ed2211e8a5cf11f1292c53a4d6801dd5 (diff) | |
| parent | 578eb33c20e722b47f74ff93c0845dc58bb6864d (diff) | |
| download | nextcloud-server-bd92b94c6a29fca3f2a3db48a8cf34ef715188c1.tar.gz nextcloud-server-bd92b94c6a29fca3f2a3db48a8cf34ef715188c1.zip | |
Merge pull request #8455 from owncloud/preview-scaleup
Dont create borders around previews when scaling up is disabled
| -rwxr-xr-x | lib/private/preview.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/preview.php b/lib/private/preview.php index 361073a0916..2964b83c508 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -615,7 +615,7 @@ class Preview { return; } - if ($newXSize < $x || $newYSize < $y) { + if (($newXSize < $x || $newYSize < $y) && $scalingUp) { if ($newXSize > $x) { $cropX = floor(($newXSize - $x) * 0.5); $image->crop($cropX, 0, $x, $newYSize); |