Merge branch 'hotfix/1.0.8'

ft-rockpress.php

@@ -3,7 +3,7 @@
  * Plugin Name: RockPress
  * Plugin URI: http://rockpresswp.com/
  * Description: Display information from Rock RMS on your WordPress site.
- * Version: 1.0.7
+ * Version: 1.0.8
  * Author: RockPress <support@rockpress.com>
  * Author URI: https://rockpress.com/
  * Text Domain: ft-rockpress
@@ -66,7 +66,7 @@ class RockPress {
 	     * @var string
 	     * @since 1.0.0
 	     */
-	    public $version = '1.0.7';
+	    public $version = '1.0.8';
 
 		/**
 	     * Main RockPress Instance

includes/class-rockpress-import.php

@@ -27,7 +27,7 @@ public static function init() {
 		add_action( 'rockpress_maintenance',				__CLASS__ . '::run' );
 		add_action( 'rockpress_import_job_queued',			__CLASS__ . '::import_job_queued' );
 		add_action( 'rockpress_import_jobs_dispatched',		__CLASS__ . '::import_jobs_dispatched' );
-		add_action( 'rockpress_background_get_complete',	__CLASS__ . '::import_complete', 100 );
+		add_action( 'rockpress_background_get_complete',	__CLASS__ . '::import_complete', 1000 );
 		add_action( 'wp_ajax_rockpress_import',				__CLASS__ . '::ajax_run' );
 		add_action( 'wp_ajax_rockpress_import_status',		__CLASS__ . '::ajax_status' );
 		add_action( 'wp_ajax_rockpress_last_import',		__CLASS__ . '::ajax_last_import' );
@@ -45,11 +45,14 @@ public static function init() {
 	public static function run() {
 
 		if ( ! RockPress()->rock->is_connected() ) {
+			delete_option( 'rockpress_current_import' );
 			delete_option( 'rockpress_last_import' );
 			delete_option( 'rockpress_import_in_progress' );
 			return;
 		}
 
+		update_option( 'rockpress_current_import', date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ) );
+
 		$jobs = apply_filters( 'rockpress_import_jobs', array() );
 
 		if ( ! is_array( $jobs ) ) {
@@ -106,8 +109,9 @@ public static function import_complete() {
 		/**
 		 * Update our import status
 		 */
+		update_option( 'rockpress_last_import', get_option( 'rockpress_current_import' ) );
 		delete_option( 'rockpress_import_in_progress' );
-		update_option( 'rockpress_last_import', date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ) );
+		delete_option( 'rockpress_current_import' );
 
 	}
 

readme.txt

@@ -2,9 +2,9 @@
 Contributors: firetree, danielmilner
 Tags: church, rockrms, chms, rock rms
 Requires at least: 4.3
-Tested up to: 4.8.1
+Tested up to: 4.8.2
 Requires PHP: 5.3
-Stable tag: 1.0.7
+Stable tag: 1.0.8
 License: GPLv2 or later
 License URI: http://ww.gnu.org/licenses/gpl-2.0.html
 
@@ -41,6 +41,9 @@ Extend the capabilities of RockPress with these add-ons:
 
 == Changelog ==
 
+= 1.0.8 =
+* Improved the data import functions.
+
 = 1.0.7 =
 * Added support for $orderby, $select, and $expand in GET requests.
 * Removed some unnecessary CSS classes.