From: Julius Haertl <jus@bitgrid.net>
Date: Tue, 22 Nov 2016 11:12:59 +0000 (+0100)
Subject: Workaround for PHP bug when calling imagescale
X-Git-Tag: v11.0RC2~160^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c4664bc8201f010671d4b672e8be2ff6beb1174;p=nextcloud-server.git

Workaround for PHP bug when calling imagescale

Signed-off-by: Julius Haertl <jus@bitgrid.net>
---

diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 58e843c5d9d..73e3ed3a4b4 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -211,7 +211,9 @@ class ThemingController extends Controller {
 			$tmpFile = $this->tempManager->getTemporaryFile();
 			if(function_exists('imagescale')) {
 				// FIXME: Once PHP 5.5.0 is a requirement the above check can be removed
-				$image = imagescale($image, 1920);
+				// Workaround for https://bugs.php.net/bug.php?id=65171
+				$newHeight = imagesy($image)/(imagesx($image)/1920);
+				$image = imagescale($image, 1920, $newHeight);
 			}
 			imageinterlace($image, 1);
 			imagejpeg($image, $tmpFile, 75);