diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-01-05 21:05:20 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-01-05 21:05:20 -0800 |
| commit | e2b0f92007eb9ef2fad994c9f8957df0bfcbeccf (patch) | |
| tree | d04e7dce2a7d5081d998014d008612673a490d33 | |
| parent | b8124efbd8f068758e70e53cc94fb1ea6c2b9ffb (diff) | |
Keep Item_Model::scale_dimensions from upscaling. Fixes #1579.
| -rw-r--r-- | modules/gallery/models/item.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 7ddcb4c2..88a444b4 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -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) { |