From 6ae08c901b72a54af7f8976d6e7feef1b2390603 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Mon, 27 Apr 2020 15:59:00 -0400 Subject: [PATCH] Fix issue processwire/processwire-issues#1162 and maybe (?) processwire/processwire-issues#1086 --- wire/core/Pageimage.php | 4 ++++ wire/core/PageimageVariations.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wire/core/Pageimage.php b/wire/core/Pageimage.php index 6ffe312a..0914e2a8 100644 --- a/wire/core/Pageimage.php +++ b/wire/core/Pageimage.php @@ -1741,6 +1741,10 @@ class Pageimage extends Pagefile { return true; } + public function __isset($key) { + if($key === 'original') return $this->original !== null; + return parent::__isset($key); + } /** * Basic debug info diff --git a/wire/core/PageimageVariations.php b/wire/core/PageimageVariations.php index fd71bac0..8d2d5a2a 100644 --- a/wire/core/PageimageVariations.php +++ b/wire/core/PageimageVariations.php @@ -253,7 +253,7 @@ class PageimageVariations extends Wire implements \IteratorAggregate, \Countable unset($info['parent'], $info['parentName'], $info['suffixAll']); } - if(!$this->pageimage->original && $info['original']) { + if(!$this->pageimage->__isset('original') && $info['original']) { $original = $this->pagefiles->get($info['original']); if($original) $this->pageimage->setOriginal($original); }