Merge pull request #8455 from owncloud/preview-scaleup

Dont create borders around previews when scaling up is disabled
12 years ago · bd92b94c6a
parent 1a454f61ed 578eb33c20
commit bd92b94c6a
1 changed files with 1 additions and 1 deletions
--- 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);