From: Marek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Date: Wed, 28 Dec 2022 15:43:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into double... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb87a2afbec4ffbd7a7462352d2f926184ba7c63;p=friendica.git

Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into doubled_code_for_scaling-dimensions

# Conflicts:
#	src/Object/Image.php
---

eb87a2afbec4ffbd7a7462352d2f926184ba7c63
diff --cc src/Object/Image.php
index 67a1af3d1e,a6436a950c..62bc8d897f
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@@ -285,10 -285,7 +285,10 @@@ class Imag
  		$width = $this->getWidth();
  		$height = $this->getHeight();
  
- 		$scale = Images::getScalingDimensions($width, $height,$max);
 -		if ((! $width)|| (! $height)) {
++		$scale = Images::getScalingDimensions($width, $height, $max);
 +		if ($scale) {
 +			return $this->scale($scale['width'], $scale['height']);
 +		} else {
  			return false;
  		}