merge

Author: DavidCramer

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/cloudinary.php

@@ -3,7 +3,7 @@
  * Plugin Name: Cloudinary
  * Plugin URI: https://cloudinary.com/documentation/wordpress_integration
  * Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
- * Version: 2.2.0-rc2
+ * Version: 2.2.0-rc3
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php

@@ -305,13 +305,16 @@ function ( $a ) {
 		}
 
 		$this->config_from_url( $url );
-		$test_result = check_status();
+		$test_result = $this->check_status();
 
 		if ( is_wp_error( $test_result ) ) {
-			$result['type']    = 'connection_error';
+			$error = $test_result->get_error_message();
+			if ( 'disabled account' !== strtolower( $error ) ) {
+				// Account Disabled, is still successful, so allow it, else we will never be able to change it.
+				$result['type'] = 'connection_error';
+			}
 			$result['message'] = ucwords( str_replace( '_', ' ', $test_result->get_error_message() ) );
 		} else {
-			$this->api = $test;
 			$this->usage_stats( true );
 		}
 
@@ -336,7 +339,8 @@ public function check_status() {
 	 * @return array|\WP_Error
 	 */
 	public function test_ping() {
-		$test = new Connect\Api( $this, $this->plugin->version );
+		$test      = new Connect\Api( $this, $this->plugin->version );
+		$this->api = $test;
 
 		return $test->ping();
 	}