Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 01:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# Conflicts:
#	src/Object/Image.php
This commit is contained in:
Marek Bachmann 2022-12-28 16:43:47 +01:00
commit eb87a2afbe
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Object/Image.php
View file

@ -285,7 +285,7 @@ class Image
$width = $this->getWidth();
$height = $this->getHeight();
$scale = Images::getScalingDimensions($width, $height,$max);
$scale = Images::getScalingDimensions($width, $height, $max);
if ($scale) {
return $this->scale($scale['width'], $scale['height']);
} else {