stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-23 22:19:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep Item_Model::scale_dimensions from upscaling. Fixes #1579.

Browse Source
This commit is contained in:
Bharat Mediratta
2011-01-05 21:05:20 -08:00
parent b8124efbd8
commit e2b0f92007
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gallery/models/item.php
View File

@@ -653,7 +653,7 @@ class Item_Model_Core extends ORM_MPTT {
/**
* Calculate the largest width/height that fits inside the given maximum, while preserving the
* aspect ratio.
* aspect ratio. Don't upscale.
* @param int $max Maximum size of the largest dimension
* @return array
*/
@@ -661,6 +661,10 @@ class Item_Model_Core extends ORM_MPTT {
$width = $this->thumb_width;
$height = $this->thumb_height;
if ($width <= $max && $height <= $max) {
return array($height, $width);
}
if ($height) {
if (isset($max)) {
if ($width > $height) {