diff options
Diffstat (limited to 'modules/gallery/models')
| -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) {  | 
