From 6fe5c10dde668315b2860e859a1f4c5b37ecfe77 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Wed, 7 Jun 2023 12:47:01 -0400 Subject: [PATCH] Fix issue processwire/processwire-issues#1744 --- wire/core/WireCache.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wire/core/WireCache.php b/wire/core/WireCache.php index b9284f4f..c0778b28 100644 --- a/wire/core/WireCache.php +++ b/wire/core/WireCache.php @@ -626,10 +626,6 @@ class WireCache extends Wire { // named expiration constant like "hourly", "daily", etc. $expire = time() + $this->expireNames[$expire]; - } else if(in_array($expire, array(self::expireNever, self::expireReserved, self::expireSave, self::expireNow))) { - // good, we'll take it as-is - return $verbose ? array('expire' => $expire) : $expire; - } else if(is_string($expire) && Selectors::stringHasSelector($expire)) { // expire when page matches selector if($verbose || $verbose === null) { @@ -637,9 +633,13 @@ class WireCache extends Wire { 'expire' => self::expireSelector, 'selector' => $expire ); - } + } return self::expireSelector; + } else if(in_array($expire, array(self::expireNever, self::expireReserved, self::expireSave, self::expireNow))) { + // good, we'll take it as-is + return $verbose ? array('expire' => $expire) : $expire; + } else { // account for date format as string