Merge branch 'hotfix/1.3.8'

firetreedesign · Oct 3, 2019 · d6aacd5 · d6aacd5
2 parents 885f60b + ed96dae
commit d6aacd5
Show file tree

Hide file tree

Showing 12 changed files with 807 additions and 567 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-  "phpcs.standard": "WordPress"
+"phpcs.standard": "WordPress",
+"phpcs.executablePath": "./vendor/bin/phpcs",
 }
diff --git a/ccbpress-core.php b/ccbpress-core.php
@@ -3,7 +3,7 @@
  * Plugin Name: CCBPress Core
  * Plugin URI: https://ccbpress.com/
  * Description: Display information from Church Community Builder on your WordPress site.
- * Version: 1.3.7
+ * Version: 1.3.8
  * Author: CCBPress <info@ccbpress.com>
  * Author URI: https://ccbpress.com/
  * Text Domain: ccbpress-core
@@ -66,7 +66,7 @@ class CCBPress_Core {
 		 * @var string
 		 * @since 1.0.0
 		 */
-		public $version = '1.3.6';
+		public $version = '1.3.8';
 
 		/**
 		 * Main CCBPress_Core Instance
@@ -219,11 +219,11 @@ public static function init() {
 		public static function schedule_cron() {
 
 			if ( false === wp_next_scheduled( 'ccbpress_maintenance' ) ) {
-				wp_schedule_event( current_time( 'timestamp' ) + 1800, 'hourly', 'ccbpress_maintenance' );
+				wp_schedule_event( time() + 1800, 'hourly', 'ccbpress_maintenance' );
 			}
 
 			if ( false === wp_next_scheduled( 'ccbpress_import' ) && false === get_option( 'ccbpress_import_in_progress', false ) && CCBPress_Import::is_queue_empty() ) {
-				wp_schedule_single_event( current_time( 'timestamp' ), 'ccbpress_import' );
+				wp_schedule_single_event( time(), 'ccbpress_import' );
 			}
 
 		}

diff --git a/dist/blocks.build.js b/dist/blocks.build.js
diff --git a/includes/admin/admin-purge-cache.php b/includes/admin/admin-purge-cache.php
@@ -29,15 +29,15 @@ public static function purge_transients() {
 		// Find transients that contain expiration dates.
 		$cache = $wpdb->get_col(
 			$wpdb->prepare(
-				"SELECT option_name FROM $wpdb->options WHERE option_name LIKE %d",
-				$wpdb->esc_like( '_transient_timeout_ccbp_' ) . '%'
+				"SELECT option_name FROM $wpdb->options WHERE option_name LIKE %s",
+				$wpdb->esc_like( '_transient_ccbp_' ) . '%'
 			)
 		);
 
 		// Delete the transients.
 		if ( ! empty( $cache ) ) {
 			foreach ( $cache as $transient ) {
-				$name = str_replace( '_transient_timeout_', '', $transient );
+				$name = str_replace( '_transient_', '', $transient );
 				if ( is_multisite() ) {
 					delete_site_transient( $name );
 				} else {