Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues/2442 #2520

Merged
merged 2 commits into from
Dec 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
6 changes: 1 addition & 5 deletions includes/admin/tools/data/class-give-tools-reset-stats.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down
6 changes: 1 addition & 5 deletions includes/admin/tools/export/class-core-settings-export.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
6 changes: 1 addition & 5 deletions includes/admin/tools/export/class-export-earnings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
6 changes: 1 addition & 5 deletions includes/admin/tools/export/class-export.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
6 changes: 1 addition & 5 deletions includes/admin/upgrades/upgrade-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'";
Expand Down
14 changes: 14 additions & 0 deletions includes/misc-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
}