From: Roland Haeder <roland@mxchange.org>
Date: Sun, 18 Jan 2015 12:32:28 +0000 (+0100)
Subject: Avoid invalid width/height (<1) + debug log added
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0a2d5f037f86fae18183ad414fbd4216446e93fa;p=quix0rs-gnu-social.git

Avoid invalid width/height (<1) + debug log added

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

diff --git a/classes/File.php b/classes/File.php
index aee16e132d..9bb22e502b 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -391,17 +391,20 @@ class File extends Managed_DataObject
             throw new UnsupportedMediaException('No image geometry available.');
         }
 
-        if ($width === null) {
+        if ($width === null || $width < 1) {
             $width = common_config('thumbnail', 'width');
             $height = common_config('thumbnail', 'height');
             $crop = common_config('thumbnail', 'crop');
         }
 
-        if ($height === null) {
+        if ($height === null || $height < 1) {
             $height = $width;
             $crop = true;
         }
 
+        // Debug log (convert crop to int to have TRUE being displayed as 1 and FALSE as 0)
+        common_debug('[' . __METHOD__ . ':' . __LINE__ . ']: width=' . $width . ',height=' . $height . ',crop=' . intval($crop));
+
         // Get proper aspect ratio width and height before lookup
         // We have to do it through an ImageFile object because of orientation etc.
         // Only other solution would've been to rotate + rewrite uploaded files.