Merge branch 'develop'

Author: scarstens

changelog.md

@@ -1,3 +1,7 @@
+#### 1.1.1
+* Hotpatch late cache init
+* Patch cron to run 5 minutes instead of 15 seconds
+
 #### 1.1.0
 * New cache clearing features on admin page
 * Rebuilt great deal of infrastructure for easier extending

inc/class-wrc-cron.php

@@ -34,8 +34,7 @@ static function init() {
 	public static function add_schedule_interval( $schedules ) {
 
 		$schedules['5_minutes'] = array(
-			'interval' => 15, // 5 minutes in seconds TODO: dont run every 30s in prod!
-//			'interval' => 300, // 5 minutes in seconds
+			'interval' => 300, // 5 minutes in seconds
 			'display'  => 'Once every 5 minutes'
 		);
 

wp-rest-cache.php

@@ -4,7 +4,7 @@
  * Plugin URI: https://github.com/WordPress-Phoenix/wordpress-rest-cache
  * Description: A solution to caching REST data calls without relying on transients or wp_options tables. Note: for multisite "Network Activate", table may need manually created before activation.
  * Author: scarstens, mlteal
- * Version: 1.1.0
+ * Version: 1.1.1
  * Author URI: http://github.com/scarstens
  * License: GPL V2
  * Text Domain: rest_cache
@@ -39,66 +39,65 @@ class WP_Rest_Cache {
 		static $table = 'rest_cache'; // the prefix is appended once we have access to the $wpdb global
 		static $columns = 'rest_md5,rest_domain,rest_path,rest_response,rest_expires,rest_last_requested,rest_tag,rest_to_update';
 		static $default_expires = 600; // defaults to 10 minutes, this is always in seconds
-
+		
 		/**
 		 * Construct the plugin object
 		 *
 		 * @since   0.1
 		 */
 		public function __construct() {
 			$this->installed_dir = plugin_dir_path( __FILE__ );
-
+			
 			// hook can be used by mu plugins to modify plugin behavior after plugin is setup
 			do_action( get_called_class() . '_preface', $this );
-
+			
 			// configure and setup the plugin class variables
 			$this->configure_defaults();
-
+			
 			// define globals used by the plugin including bloginfo
 			$this->defines_and_globals();
-
+			
 			// Loads the /inc/ autoloader
 			$this->load_classes();
-
+			
+			if ( ! defined( 'NO_WP_REST_CACHE' ) ) {
+				if ( class_exists( 'WRC_Caching' ) ) {
+					WRC_Caching::init();
+				}
+			}
 			// initialize plugin during init
 			add_action( 'init', array( $this, 'init' ), 5 );
-
 			// init for use with logged in users, see this::authenticated_init for more details
 			add_action( 'init', array( $this, 'authenticated_init' ) );
-
+			
 			// hook can be used by mu plugins to modify plugin behavior after plugin is setup
 			do_action( get_called_class() . '_setup', $this );
-
+			
 		} // END public function __construct
-
+		
 		/**
 		 * Initialize the plugin - for public (front end)
 		 *
 		 * @since   0.1
 		 * @return  void
 		 */
 		public function init() {
-
+			
 			do_action( get_called_class() . '_before_init' );
-			if ( ! defined( 'NO_WP_REST_CACHE' ) ) {
-				if ( class_exists( 'WRC_Caching' ) ) {
-					WRC_Caching::init();
-				}
-
-				if ( class_exists( 'WRC_Cron' ) ) {
-					WRC_Cron::init();
-				}
+			
+			if ( class_exists( 'WRC_Cron' ) ) {
+				WRC_Cron::init();
 			}
-
+			
 			if ( class_exists( 'WRC_Filters' ) ) {
 				WRC_Filters::init();
 			}
 
 			add_action('wp_ajax_wrc-ajax-run', array('WRC_Ajax', 'run'));
-
+			
 			do_action( get_called_class() . '_after_init' );
 		}
-
+		
 		/**
 		 * Initialize the plugin - for admin (back end)
 		 * You would expected this to be handled on action admin_init, but it does not properly handle
@@ -114,17 +113,17 @@ public function authenticated_init() {
 				WRC_Admin::init();
 			}
 		}
-
+		
 		/**
 		 * Activate the plugin
 		 *
 		 * @since   0.1
 		 * @return  void
 		 */
 		public static function activate() {
-
+			
 			// create our table if it doesn't already exist
-
+			
 			$sql = "CREATE TABLE " . REST_CACHE_TABLE . " (
   `rest_last_requested` date NOT NULL,
   `rest_expires` datetime DEFAULT NULL,
@@ -142,27 +141,27 @@ public static function activate() {
   KEY `rest_tag` (`rest_tag`(191)),
   KEY `rest_to_update` (`rest_to_update`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;";
-
+			
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 			dbDelta( $sql );
-
+			
 		} // END public static function activate
-
+		
 		/**
 		 * Deactivate the plugin
 		 *
 		 * @since   0.1
 		 * @return  void
 		 */
 		public static function deactivate() {
-
+			
 			/*
 			 * Do not delete site options on deactivate. Usually only things in here will be related to
 			 * cache clearing like updating permalinks since some may no longer exist
 			 */
-
+			
 		} // END public static function deactivate
-
+		
 		/**
 		 * Loads PHP files in the includes folder
 		 *
@@ -173,18 +172,18 @@ protected function load_classes() {
 			// this class self-instantiates from within the file
 			require_once( 'class-wrc-autoloader.php');
 		}
-
+		
 		protected function defines_and_globals() {
 			global $wpdb;
 			define( 'REST_CACHE_DB_PREFIX', $wpdb->base_prefix );
 			define( 'REST_CACHE_TABLE', REST_CACHE_DB_PREFIX . static::$table );
 		}
-
+		
 		protected function configure_defaults() {
 			$this->installed_dir  = dirname( __FILE__ );
 			$this->installed_url  = plugins_url( '/', __FILE__ );
 		}
-
+		
 		/**
 		 * This function is used to make it quick and easy to programatically do things only on your development
 		 * domains. Typical usage would be to change debugging options or configure sandbox connections to APIs.
@@ -193,7 +192,7 @@ public static function is_dev() {
 			// catches dev.mydomain.com, mydomain.dev, wpengine staging domains and mydomain.staging
 			return (bool) ( stristr( WP_NETWORKURL, '.dev' ) || stristr( WP_NETWORKURL, '.wpengine' ) || stristr( WP_NETWORKURL, 'dev.' ) || stristr( WP_NETWORKURL, '.staging' ) );
 		}
-
+		
 	} // END class
 } // END if(!class_exists())
 
@@ -204,7 +203,7 @@ public static function is_dev() {
 	// Installation and un-installation hooks
 	register_activation_hook( __FILE__, array( 'WP_Rest_Cache', 'activate' ) );
 	register_deactivation_hook( __FILE__, array( 'WP_Rest_Cache', 'deactivate' ) );
-
+	
 	// instantiate the plugin class, which should never be instantiated more then once
 	global $WP_Rest_Cache;
 	$WP_Rest_Cache = new WP_Rest_Cache();