From 1cbd3fa9a48efa462aba349603cee5122788b4a2 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 30 Sep 2016 08:49:30 -0400 Subject: [PATCH] Fix issue #12 where image was broken when repurposing the image crop function "save as a copy" as an image duplicate function. --- .../ProcessPageEditImageSelect.module | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module index 96cf215c..7e5bf482 100644 --- a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module +++ b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module @@ -980,9 +980,10 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule { if(!$width) throw new WireException("Width not specified"); $rebuildVariations = preg_match('/-cropx\d+y\d+/', $image->name); + $useResize = ((int) $this->wire('input')->post('use_resize')) == 1; // image2 = resized version - if(((int) $this->wire('input')->post('use_resize')) == 1) { + if($useResize) { $image2 = $image->width($width); if(!$image2 || !$image2->width) throw new WireException('Unable to complete resize'); } else { @@ -1059,7 +1060,11 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule { $pathname = $path . $basename; } while(is_file($pathname)); - rename($image2->filename(), $pathname); + if(!$useResize && !$rebuildVariations) { + $this->wire('files')->copy($image2->filename(), $pathname); + } else { + rename($image2->filename(), $pathname); + } $pageimages->add($pathname); $pageimage = $pageimages->last(); $pageimage->isTemp(true);