Skip to content

Commit

Permalink
Roll out 6.0.5.3
Browse files Browse the repository at this point in the history 
* Removed rogue `return;` causing blank screen on certain pages.
* Wrapped transient in else statement to prevent wrong data from being stored when an error is hit.
  • Loading branch information
Evan Herman committed Mar 14, 2016
1 parent 81ed9d2 commit 1034c0b
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 38 deletions.
6 changes: 3 additions & 3 deletions plugin_core/admin/partials/ajax/class.ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ public static function check_list_for_interest_groups( $list_id='', $integration
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
}
return;
} else {
// set the transient for 2 hours
set_transient( $list_id . '_interest_group', $interest_groupings, 2 * HOUR_IN_SECONDS );
}
// set the transient for 2 hours
set_transient( $list_id . '_interest_group', $interest_groupings, 2 * HOUR_IN_SECONDS );
}
if( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
require( YIKES_MC_PATH . 'admin/partials/menu/options-sections/templates/integration-interest-groups.php' );
Expand Down
11 changes: 6 additions & 5 deletions plugin_core/admin/partials/dashboard-widgets/class.list-activity-widget.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ function list_stats_dashboard_widget() {
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
}
} else {
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
?>
<!-- Dropdown to Change the list -->
Expand Down Expand Up @@ -139,10 +140,10 @@ function account_activity_dashboard_widget() {
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity['error'], __( "Get Account Activity" , 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
}
return;
} else {
// set our transient for one hour
set_transient( 'yikes-easy-mailchimp-account-activity', $account_activity, 1 * HOUR_IN_SECONDS );
}
// set our transient for one hour
set_transient( 'yikes-easy-mailchimp-account-activity', $account_activity, 1 * HOUR_IN_SECONDS );
}
if( ! empty( $account_activity ) ) {
include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/account-activity-template.php' );
Expand Down
10 changes: 4 additions & 6 deletions plugin_core/admin/partials/edit-form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
}
return;
}
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
} else {
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
}

// get the list data
Expand All @@ -107,7 +107,6 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $available_merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
}
return;
}

// get the interest group data
Expand All @@ -129,7 +128,6 @@
require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
return;
}
}

Expand Down
17 changes: 9 additions & 8 deletions plugin_core/admin/partials/menu/account-details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
$error_logging->yikes_easy_mailchimp_write_to_error_log( $profile_info['error'], __( "Get Profile Info." , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
}
return;
} else {
// set our transient for one week
set_transient( 'yikes-easy-mailchimp-profile-data', $profile_info, 1 * WEEK_IN_SECONDS );
}
// set our transient for one week
set_transient( 'yikes-easy-mailchimp-profile-data', $profile_info, 1 * WEEK_IN_SECONDS );
}
if ( false === ( $account_details = get_transient( 'yikes-easy-mailchimp-account-data' ) ) ) {
if( $dash_position !== false ) {
Expand All @@ -46,10 +47,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details['error'], __( "Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
}
return;
} else {
// set our transient for one hour
set_transient( 'yikes-easy-mailchimp-account-data', $account_details, 1 * HOUR_IN_SECONDS );
}
// set our transient for one hour
set_transient( 'yikes-easy-mailchimp-account-data', $account_details, 1 * HOUR_IN_SECONDS );
}
if ( false === ( $account_activity = get_transient( 'yikes-easy-mailchimp-account-activity' ) ) ) {
// retreive our list data
Expand All @@ -70,10 +71,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity['error'], __( "Get Chimp Chatter" , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
}
return;
} else {
// set our transient for one hour
set_transient( 'yikes-easy-mailchimp-account-activity', $account_activity, 1 * HOUR_IN_SECONDS );
}
// set our transient for one hour
set_transient( 'yikes-easy-mailchimp-account-activity', $account_activity, 1 * HOUR_IN_SECONDS );
}
} else {
wp_die( __( 'It looks like you need to re-validate your MailChimp API key before you can continue.' , 'yikes-inc-easy-mailchimp-extender' ) , 500 );
Expand Down
8 changes: 4 additions & 4 deletions plugin_core/admin/partials/menu/lists.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
}
return;
}
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
} else {
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
}
} else {
wp_die( __( 'It looks like you need to re-validate your MailChimp API key before you can continue.' , 'yikes-inc-easy-mailchimp-extender' ) , 500 );
Expand Down
6 changes: 3 additions & 3 deletions plugin_core/admin/partials/menu/manage-forms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Manage Forms Page" );
}
return;
} else {
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
} else {
$list_data = null;
Expand Down
6 changes: 3 additions & 3 deletions plugin_core/admin/partials/menu/manage-lists.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Manage Lists Page" );
}
return;
} else {
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
}
?>
Expand Down
6 changes: 3 additions & 3 deletions plugin_core/admin/partials/menu/options-sections/integration-settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Integration Settings Page" );
}
return;
} else {
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
// set our transient
set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
}
} else {
?>
Expand Down
2 changes: 1 addition & 1 deletion plugin_core/includes/class-yikes-inc-easy-mailchimp-extender.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Yikes_Inc_Easy_Mailchimp_Extender {
*/
public function __construct() {
$this->yikes_inc_easy_mailchimp_extender = 'yikes-inc-easy-mailchimp-extender';
$this->version = '6.0.5.2';
$this->version = '6.0.5.3';
$this->load_dependencies();
$this->define_admin_hooks();
$this->define_public_hooks();
Expand Down
2 changes: 1 addition & 1 deletion plugin_core/readme.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugin_core/yikes-inc-easy-mailchimp-extender.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Easy Forms for MailChimp by YIKES
* Plugin URI: http://www.yikesinc.com/services/yikes-inc-easy-mailchimp-extender/
* Description: YIKES Easy Forms for MailChimp links your site to MailChimp and allows you to generate and display mailing list opt-in forms anywhere on your site with ease.
* Version: 6.0.5.2
* Version: 6.0.5.3
* Author: YIKES
* Author URI: http://www.yikesinc.com/
* License: GPL-3.0+
Expand Down

0 comments on commit 1034c0b

Please sign in to comment.