MC/AWeber tweaks.

wpsharks · Oct 8, 2014 · 163e20c · 163e20c
1 parent 244912b
commit 163e20c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/s2member-pro b/s2member-pro
diff --git a/s2member/includes/classes/aweber.inc.php b/s2member/includes/classes/aweber.inc.php
@@ -140,7 +140,7 @@ public static function subscribe($args)
 			if(empty($GLOBALS['WS_PLUGIN__']['s2member']['o']['level'.$args->level.'_aweber_list_ids']))
 				return FALSE; // No list configured at this level.
 
-			if(!($aw_api = self::aw_api()) || empty($aw_api->___account->id))
+			if(!($aw_api = self::aw_api()) || !@$aw_api->___account->id)
 				return FALSE; // Unable to acquire API instance.
 
 			$aw_level_list_ids = $GLOBALS['WS_PLUGIN__']['s2member']['o']['level'.$args->level.'_aweber_list_ids'];
@@ -202,7 +202,7 @@ public static function subscribe($args)
 
 									unset($_existing_subscriber); // Housekeeping.
 								}
-								else if(($_aw['subscriber'] = $_aw['list']->subscribers->create($_aw['subscriber'])) && !empty($_aw['subscriber']->id))
+								else if(($_aw['subscriber'] = $_aw['list']->subscribers->create($_aw['subscriber_props'])) && @$_aw['subscriber']->id)
 									$_aw['api_success'] = $success = TRUE; // Flag this as `TRUE`; assists with return value below.
 							}
 				}
@@ -244,7 +244,7 @@ public static function unsubscribe($args)
 			if(empty($GLOBALS['WS_PLUGIN__']['s2member']['o']['level'.$args->level.'_aweber_list_ids']))
 				return FALSE; // No list configured at this level.
 
-			if(!($aw_api = self::aw_api()) || empty($aw_api->___account->id))
+			if(!($aw_api = self::aw_api()) || !@$aw_api->___account->id)
 				return FALSE; // Unable to acquire API instance.
 
 			$aw_level_list_ids = $GLOBALS['WS_PLUGIN__']['s2member']['o']['level'.$args->level.'_aweber_list_ids'];

diff --git a/s2member/includes/classes/mailchimp.inc.php b/s2member/includes/classes/mailchimp.inc.php
@@ -112,7 +112,7 @@ public static function subscribe($args)
 							($_mc['api_update_existing'] = apply_filters('ws_plugin__s2member_mailchimp_update_existing', TRUE, get_defined_vars())), // Existing subscribers should be updated with this?
 							($_mc['api_replace_interests'] = apply_filters('ws_plugin__s2member_mailchimp_replace_interests', TRUE, get_defined_vars())), // Replace interest groups? (only if provided).
 							($_mc['api_send_welcome'] = apply_filters('ws_plugin__s2member_mailchimp_send_welcome', FALSE, get_defined_vars()))))
-					   && !empty($_mc['api_response']->email)
+					   && !empty($_mc['api_response']['email'])
 					) $_mc['api_success'] = $success = TRUE;
 				}
 				catch(Exception $exception)
@@ -185,7 +185,7 @@ public static function unsubscribe($args)
 							($_mc['api_delete_member'] = apply_filters('ws_plugin__s2member_mailchimp_removal_delete_member', FALSE, get_defined_vars())), // Completely delete?
 							($_mc['api_send_goodbye'] = apply_filters('ws_plugin__s2member_mailchimp_removal_send_goodbye', FALSE, get_defined_vars())), // Send goodbye letter?
 							($_mc['api_send_notify'] = apply_filters('ws_plugin__s2member_mailchimp_removal_send_notify', FALSE, get_defined_vars()))))
-					   && !empty($_mc['api_response']->complete)
+					   && !empty($_mc['api_response']['complete'])
 					) $_mc['api_success'] = $success = TRUE;
 				}
 				catch(Exception $exception)