From 1f6ae656dc65469512cb7c582af97d7a57b27f20 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 9 Feb 2018 10:10:09 -0500 Subject: [PATCH] Bump version to 3.0.91 --- wire/core/Pageimage.php | 6 ++++-- wire/core/ProcessWire.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wire/core/Pageimage.php b/wire/core/Pageimage.php index 06dc1878..465e7525 100644 --- a/wire/core/Pageimage.php +++ b/wire/core/Pageimage.php @@ -591,7 +591,7 @@ class Pageimage extends Pagefile { $width = (int) $width; $height = (int) $height; - if($options['cropping'] === true && empty($options['cropExtra']) && $options['focus'] && $this->hasFocus) { + if($options['cropping'] === true && empty($options['cropExtra']) && $options['focus'] && $this->hasFocus && $width && $height) { // crop to focus area $focus = $this->focus(); $focus['zoom'] = 0; // not yet supported @@ -1165,7 +1165,8 @@ class Pageimage extends Pagefile { $o['forceNew'] = true; $o['suffix'] = $info['suffix']; if(is_file($info['path'])) unlink($info['path']); - + + /* if(!$info['width'] && $info['actualWidth']) { $info['width'] = $info['actualWidth']; $options['nameWidth'] = 0; @@ -1174,6 +1175,7 @@ class Pageimage extends Pagefile { $info['height'] = $info['actualHeight']; $options['nameHeight'] = 0; } + */ if($info['crop'] && preg_match('/^x(\d+)y(\d+)$/', $info['crop'], $matches)) { // dimensional cropping info contained in filename diff --git a/wire/core/ProcessWire.php b/wire/core/ProcessWire.php index 5252794d..7be5de8b 100644 --- a/wire/core/ProcessWire.php +++ b/wire/core/ProcessWire.php @@ -45,7 +45,7 @@ class ProcessWire extends Wire { * Reversion revision number * */ - const versionRevision = 90; + const versionRevision = 91; /** * Version suffix string (when applicable)