Do not declare cache functions on WP_STASH_BYPASS

an early return in object-cache.php won't avoid wp_cache* to be declared anyway
inpsyde · Oct 28, 2020 · bda46dd · bda46dd
1 parent e3cbb74
commit bda46dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/dropin/object-cache.php b/dropin/object-cache.php
@@ -24,10 +24,6 @@
  * @link https://github.com/WordPress/WordPress/blob/32d193f96fea928a487e51698fd1861bf6c66978/wp-includes/load.php#L649-L651
  */
 
-if (getenv('WP_STASH_BYPASS') !== false) {
-    return;
-}
-
 /**
  * Adds data to the cache, if the cache key doesn't already exist.
  *
@@ -316,4 +312,4 @@ function wp_cache_get_multiple($keys, $group = '', $force = false)
     assert($wp_object_cache instanceof ObjectCacheProxy);
 
     return $wp_object_cache->get_multiple($keys, $group, $force);
-}
+}
diff --git a/src/WpStash.php b/src/WpStash.php
@@ -212,7 +212,9 @@ private function ensureDropIn(): bool
     unlink(__FILE__);
     return;
 }
-require_once '%1$s';
+if (filter_var(getenv('WP_STASH_BYPASS'), FILTER_VALIDATE_BOOL) === false) {
+    require_once '%1$s';
+}
 
 PHPCODE
             ,