improved shutdown hook handler

rhubarbgroup · May 31, 2020 · c76dcf8 · c76dcf8
1 parent 4909cb9
commit c76dcf8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
-## [Unreleased]
+## 1.6.3
 
+- Improved registration of `shutdown` callback
 - Prevent PHP warnings in `maybe_print_comment()`
 
 ## 1.6.2

diff --git a/includes/object-cache.php b/includes/object-cache.php
@@ -3,7 +3,7 @@
 Plugin Name: Redis Object Cache Drop-In
 Plugin URI: http://wordpress.org/plugins/redis-cache/
 Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, HHVM, replication, clustering and WP-CLI.
-Version: 1.6.2
+Version: 1.6.3
 Author: Till Krüss
 Author URI: https://till.im/
 License: GPLv3

diff --git a/redis-cache.php b/redis-cache.php
@@ -3,7 +3,7 @@
 Plugin Name: Redis Object Cache
 Plugin URI: https://wordpress.org/plugins/redis-cache/
 Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, HHVM, replication, clustering and WP-CLI.
-Version: 1.6.2
+Version: 1.6.3
 Text Domain: redis-cache
 Domain Path: /languages
 Author: Till Krüss
@@ -49,7 +49,7 @@ public function __construct() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
         add_action( 'load-' . $this->screen, array( $this, 'do_admin_actions' ) );
         add_action( 'load-' . $this->screen, array( $this, 'add_admin_page_notices' ) );
-        add_action( 'shutdown', array( $this, 'maybe_print_comment' ), 0 );
+        add_action( 'wp_head', array( $this, 'register_shutdown_hooks' ) );
         add_action( 'wp_ajax_roc_dismiss_notice', array( $this, 'dismiss_notice' ) );
 
         add_filter( sprintf(
@@ -478,24 +478,15 @@ public function wc_pro_notice() {
         );
     }
 
-    public function maybe_print_comment() {
-        global $wp_object_cache;
-
-        if (
-            ! isset( $wp_object_cache->cache_hits ) ||
-            ! isset( $wp_object_cache->redis_client ) ||
-            ! is_array( $wp_object_cache->cache )
-        ) {
-            return;
-        }
-
-        if ( defined( 'WP_REDIS_DISABLE_COMMENT' ) && WP_REDIS_DISABLE_COMMENT ) {
-            return;
+    public function register_shutdown_hooks()
+    {
+        if ( ! defined( 'WP_REDIS_DISABLE_COMMENT' ) || ! WP_REDIS_DISABLE_COMMENT ) {
+            add_action( 'shutdown', array( $this, 'maybe_print_comment' ), 0 );
         }
+    }
 
-        if ( ! defined( 'WP_USE_THEMES' ) || ! WP_USE_THEMES ) {
-            return;
-        }
+    public function maybe_print_comment() {
+        global $wp_object_cache;
 
         if (
             ( defined( 'DOING_CRON' ) && DOING_CRON ) ||
@@ -513,6 +504,14 @@ public function maybe_print_comment() {
             return;
         }
 
+        if (
+            ! isset( $wp_object_cache->cache_hits ) ||
+            ! isset( $wp_object_cache->redis_client ) ||
+            ! is_array( $wp_object_cache->cache )
+        ) {
+            return;
+        }
+
         $message = sprintf(
             __( 'Performance optimized by Redis Object Cache. Learn more: %s', 'redis-cache' ),
             'https://wprediscache.com'