Remove class property that isn't used. If a GET request gives us an error, return that so we can display it

Author: dkotter

lib/mailchimp/mailchimp.php

@@ -17,13 +17,6 @@ class MailChimp_API {
 	 */
 	public $key;
 
-	/**
-	 * The API key
-	 *
-	 * @var string
-	 */
-	public $api_key;
-
 	/**
 	 * The API url
 	 *
@@ -101,6 +94,10 @@ public function get( $endpoint, $count = 10, $fields = array() ) {
 
 		$request = wp_remote_get( $url, $args );
 
+		if ( is_wp_error( $request ) ) {
+			return $request;
+		}
+
 		if ( is_array( $request ) && 200 === $request['response']['code'] ) {
 			return json_decode( $request['body'], true );
 		} elseif ( is_array( $request ) && $request['response']['code'] ) {

mailchimp.php

@@ -1223,7 +1223,7 @@ function mailchimp_sf_verify_key( $api ) {
 
 	// Might as well set this data if we have it already.
 	$valid_roles = array( 'owner', 'admin', 'manager' );
-	if ( in_array( $user['role'], $valid_roles, true ) ) {
+	if ( isset( $user['role'] ) && in_array( $user['role'], $valid_roles, true ) ) {
 		update_option( 'mc_api_key', $api->key );
 		update_option( 'mc_user', $user );
 		update_option( 'mc_datacenter', $api->datacenter );