Merge pull request #2520 from ravinderk/issues/2442

Issues/2442
impress-org · Dec 14, 2017 · e0fad15 · e0fad15
2 parents dce4e18 + 2a81821
commit e0fad15
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 55 deletions.
diff --git a/includes/admin/tools/data/class-give-tools-delete-test-transactions.php b/includes/admin/tools/data/class-give-tools-delete-test-transactions.php
@@ -147,11 +147,7 @@ public function process_step() {
 	 * Headers
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/data/class-give-tools-recount-all-stats.php b/includes/admin/tools/data/class-give-tools-recount-all-stats.php
@@ -263,11 +263,7 @@ public function process_step() {
 	 * Set headers.
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/data/class-give-tools-recount-donor-stats.php b/includes/admin/tools/data/class-give-tools-recount-donor-stats.php
@@ -215,11 +215,7 @@ public function process_step() {
 	 * Headers
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/data/class-give-tools-recount-form-stats.php b/includes/admin/tools/data/class-give-tools-recount-form-stats.php
@@ -199,11 +199,7 @@ public function process_step() {
 	}
 
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/data/class-give-tools-recount-income.php b/includes/admin/tools/data/class-give-tools-recount-income.php
@@ -176,11 +176,7 @@ public function process_step() {
 	 * Headers.
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/data/class-give-tools-recount-single-donor-stats.php b/includes/admin/tools/data/class-give-tools-recount-single-donor-stats.php
@@ -200,11 +200,7 @@ public function process_step() {
 	}
 
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/data/class-give-tools-reset-stats.php b/includes/admin/tools/data/class-give-tools-reset-stats.php
@@ -217,11 +217,7 @@ public function process_step() {
 	 * Headers
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 	}
 
 	/**

diff --git a/includes/admin/tools/export/class-core-settings-export.php b/includes/admin/tools/export/class-core-settings-export.php
@@ -39,11 +39,7 @@ class Give_Core_Settings_Export extends Give_Export {
 	 * @return void
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 
 		nocache_headers();
 		header( 'Content-Type: application/json; charset=utf-8' );

diff --git a/includes/admin/tools/export/class-export-earnings.php b/includes/admin/tools/export/class-export-earnings.php
@@ -38,11 +38,7 @@ class Give_Earnings_Export extends Give_Export {
 	 * @return void
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 
 		nocache_headers();
 		header( 'Content-Type: text/csv; charset=utf-8' );

diff --git a/includes/admin/tools/export/class-export.php b/includes/admin/tools/export/class-export.php
@@ -48,11 +48,7 @@ public function can_export() {
 	 * @return void
 	 */
 	public function headers() {
-		ignore_user_abort( true );
-
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
-		}
+		give_ignore_user_abort();
 
 		nocache_headers();
 		header( 'Content-Type: text/csv; charset=utf-8' );

diff --git a/includes/admin/upgrades/upgrade-functions.php b/includes/admin/upgrades/upgrade-functions.php
@@ -236,11 +236,7 @@ function give_v132_upgrade_give_payment_customer_id() {
 		) );
 	}
 
-	ignore_user_abort( true );
-
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
-	}
+	give_ignore_user_abort();
 
 	// UPDATE DB METAKEYS.
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";

diff --git a/includes/misc-functions.php b/includes/misc-functions.php
@@ -1611,4 +1611,18 @@ function give_doing_it_wrong( $function, $message, $version ) {
 	$message .= "\nBacktrace:" . wp_debug_backtrace_summary();
 
 	_doing_it_wrong( $function, $message , $version );
+}
+
+
+/**
+ * Remove limit from running php script complete.
+ *
+ * @since 1.8.18
+ */
+function give_ignore_user_abort(){
+	ignore_user_abort( true );
+
+	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
+		set_time_limit( 0 );
+	}
 }