mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-23 06:44:38 +02:00
Code Issues Releases Wiki Activity

Adjustment for issue processwire/processwire-issues#709

Browse Source
This commit is contained in:
Ryan Cramer
2018-09-27 07:54:57 -04:00
parent e6bcd3e44c
commit 45f0c14831
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wire/core/Pageimage.php
View File

@@ -1011,18 +1011,26 @@ class Pageimage extends Pagefile {
* *
* @param int $width Max allowed width * @param int $width Max allowed width
* @param int $height Max allowed height * @param int $height Max allowed height
* @param array $options See `Pageimage::size()` method for options * @param array $options See `Pageimage::size()` method for options, or these additional options:
* - `allowOriginal` (bool): Allow original image to be returned if already within max requested dimensions? (default=false)
* @return Pageimage * @return Pageimage
* *
*/ */
public function maxSize($width, $height, $options = array()) { public function maxSize($width, $height, $options = array()) {
$defaults = array(
'allowOriginal' => false,
'upscaling' => false,
'cropping' => false
);
$options = array_merge($defaults, $options);
$adjustedWidth = $width < 1 || $this->width() <= $width ? 0 : $width; $adjustedWidth = $width < 1 || $this->width() <= $width ? 0 : $width;
$adjustedHeight = $height < 1 || $this->height() <= $height ? 0 : $height; $adjustedHeight = $height < 1 || $this->height() <= $height ? 0 : $height;
// if already within maxSize dimensions then do nothing // if already within maxSize dimensions then do nothing
if(!$adjustedWidth && !$adjustedHeight) { if(!$adjustedWidth && !$adjustedHeight) {
if(empty($options)) return $this; // image already within target if($options['allowOriginal']) return $this; // image already within target
$adjustedWidth = $width; $adjustedWidth = $width;
$options['nameHeight'] = $height; $options['nameHeight'] = $height;
} else if(!$adjustedWidth) { } else if(!$adjustedWidth) {
@@ -1031,9 +1039,6 @@ class Pageimage extends Pagefile {
$options['nameHeight'] = $height; $options['nameHeight'] = $height;
} }
$options['upscaling'] = false;
$options['cropping'] = false;
if($this->wire('config')->installed > 1513336849) { if($this->wire('config')->installed > 1513336849) {
// New installations from 2017-12-15 forward use an "ms" suffix for images from maxSize() method // New installations from 2017-12-15 forward use an "ms" suffix for images from maxSize() method
$suffix = isset($options['suffix']) ? $options['suffix'] : array(); $suffix = isset($options['suffix']) ? $options['suffix'] : array();