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

Fix issue processwire/processwire-issues#454 for Pageimage::maxSize()

Browse Source
This commit is contained in:
Ryan Cramer
2017-12-15 06:30:36 -05:00
parent 77ad382bcd
commit ded6476832
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wire/core/Pageimage.php
View File

@@ -400,16 +400,6 @@ class Pageimage extends Pagefile {
*/ */
protected function ___size($width, $height, $options) { protected function ___size($width, $height, $options) {
// I was getting unnecessarily resized images without this code below,
// but this may be better solved in ImageSizer?
/*
$w = $this->width();
$h = $this->height();
if($w == $width && $h == $height) return $this;
if(!$height && $w == $width) return $this;
if(!$width && $h == $height) return $this;
*/
if($this->ext == 'svg') return $this; if($this->ext == 'svg') return $this;
if(!is_array($options)) { if(!is_array($options)) {
@@ -832,13 +822,18 @@ class Pageimage extends Pagefile {
* *
*/ */
public function maxSize($width, $height, $options = array()) { public function maxSize($width, $height, $options = array()) {
$w = $this->width(); $options['upscaling'] = false;
$h = $this->height(); $options['cropping'] = false;
if($w >= $h) {
return $this->maxWidth($width, $options); if($this->wire('config')->installed > 1513336849) {
} else { // New installations from 2017-12-15 forward use an "ms" suffix for images from maxSize() method
return $this->maxHeight($height, $options); $suffix = isset($options['suffix']) ? $options['suffix'] : array();
if(!is_array($suffix)) $suffix = array();
$suffix[] = 'ms';
$options['suffix'] = $suffix;
} }
return $this->size($width, $height, $options);
} }
/** /**