Rollback to 2.0.0

Author: Dukagjin Surdulli

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.0.1
+ * Version: 2.0.0
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

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

@@ -571,7 +571,7 @@ public function cloudinary_url( $attachment_id, $size = array(), $transformation
 			'version'       => $this->get_post_meta( $attachment_id, Sync::META_KEYS['version'], true ),
 			'resource_type' => $resource_type,
 		);
-		
+
 		// Check size and correct if string or size.
 		if ( is_string( $size ) || ( is_array( $size ) && 3 === count( $size ) ) ) {
 			$intermediate = image_get_intermediate_size( $attachment_id, $size );
@@ -692,11 +692,6 @@ public function cloudinary_id( $attachment_id ) {
 		 * @return string|bool
 		 */
 		$cloudinary_id = apply_filters( 'cloudinary_id', $cloudinary_id, $attachment_id );
-
-		if ( empty( $cloudinary_id ) ) {
-			return false;
-		}
-
 		// Cache ID to prevent multiple lookups.
 		if ( false !== $cloudinary_id ) {
 			$this->cloudinary_ids[ $attachment_id ] = $cloudinary_id;
@@ -767,11 +762,10 @@ public function image_srcset( $sources, $size_array, $image_src, $image_meta, $a
 		if ( false === $cloudinary_id ) {
 			return $sources; // Return WordPress default sources.
 		}
-		
 		// Get transformations from URL.
 		$transformations = $this->get_transformations_from_string( $image_src );
-		
 		// Use Cloudinary breakpoints for same ratio.
+
 		if ( 'on' === $this->plugin->config['settings']['global_transformations']['enable_breakpoints'] && wp_image_matches_ratio( $image_meta['width'], $image_meta['height'], $size_array[0], $size_array[1] ) ) {
 			$meta = $this->get_post_meta( $attachment_id, Sync::META_KEYS['breakpoints'], true );
 			if ( ! empty( $meta ) ) {
@@ -807,11 +801,11 @@ function ( $item ) use ( $crop ) {
 					);
 				}
 				krsort( $sources, SORT_NUMERIC );
-				
+
 				return $sources;
 			}
 		}
-		
+
 		// Add the main size as the largest srcset src.
 		$crop = $this->get_crop_from_transformation( $transformations );
 		if ( ! empty( $crop ) ) {

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

@@ -48,7 +48,6 @@ class Sync implements Setup, Assets {
 		'transformation' => '_transformations',
 		'sync_error'     => '_sync_error',
 		'cloudinary'     => '_cloudinary_v2',
-		'attempts'       => '_sync_attempts',
 	);
 
 	/**

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

@@ -55,20 +55,6 @@ public function check_cloudinary_version( $cloudinary_id, $attachment_id ) {
 			 */
 			if ( ! empty( $meta['cloudinary'] ) && empty( $public_id ) ) {
 				$cloudinary_id = $this->convert_cloudinary_version( $attachment_id );
-			} elseif ( ! empty( $meta['cloudinary'] ) ) {
-				// Has public ID, but still has cloudinary, check pending status.
-				$is_pending = $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['pending'], true );
-				$attempts   = (int) $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['attempts'], true );
-				if ( ( empty( $is_pending ) || $is_pending < time() - 5 * 60 ) && 10 > $attempts ) {
-					// Timeout.
-					$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['attempts'], $attempts + 1 );
-
-					// return proposed ID to allow front render.
-					return $this->convert_cloudinary_version( $attachment_id );
-				}
-				$cloudinary_id = $public_id;
-			} else {
-				$cloudinary_id = $public_id;
 			}
 		}
 
@@ -119,8 +105,6 @@ function ( $val ) use ( $media ) {
 		$public_id = strstr( $public_id, '.' . $path['extension'], true );
 		// Save public ID.
 		$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['public_id'], $public_id );
-		// Set download started data.
-		$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['pending'], time() );
 
 		// Setup a call for a background sync.
 		$params = array(
@@ -141,7 +125,7 @@ public function setup_hooks() {
 		add_filter( 'cloudinary_id', array( $this, 'check_cloudinary_version' ), 9, 2 ); // Priority 9, to take preference over prep_on_demand_upload.
 
 		// Add a redirection to the new plugin settings, from the old plugin.
-		if ( is_admin() ) {
+		if( is_admin() ) {
 			add_action( 'admin_menu', function () {
 				global $plugin_page;
 				if ( ! empty( $plugin_page ) && false !== strpos( $plugin_page, 'cloudinary-image-management-and-manipulation-in-the-cloud-cdn' ) ) {

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

@@ -7,8 +7,6 @@
 
 namespace Cloudinary\Sync;
 
-use Cloudinary\Sync;
-
 /**
  * Class Download_Sync.
  *
@@ -90,15 +88,9 @@ public function rest_can_upload_files( \WP_REST_Request $request ) {
 	 */
 	public function handle_failed_download( $attachment_id, $error ) {
 		// @todo: Place a handler to catch the error for logging.
+		// Delete attachment temp.
+		wp_delete_attachment( $attachment_id, true );
 
-		$is_pending = $this->plugin->components['media']->get_post_meta( $attachment_id, Sync::META_KEYS['pending'], true );
-		if ( ! empty( $is_pending ) ) {
-			// Dont delete if it's a downsync.
-			$this->plugin->components['media']->update_post_meta( $attachment_id, Sync::META_KEYS['sync_error'], $error );
-		} else {
-			// Delete attachment temp.
-			wp_delete_attachment( $attachment_id, true );
-		}
 		// Send error.
 		wp_send_json_error( $error );
 	}
@@ -189,10 +181,6 @@ public function rest_download_asset( \WP_REST_Request $request ) {
 			'data'    => $attachment,
 		);
 
-		// Remove pending.
-		delete_post_meta( $attachment_id, Sync::META_KEYS['pending'] );
-		delete_post_meta( $attachment_id, Sync::META_KEYS['sync_error'] );
-
 		return rest_ensure_response( $response );
 	}
 }

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

@@ -108,9 +108,6 @@ You can read the plugin [documentation](https://cloudinary.com/documentation/wor
 9. Easily Configure Your Account
 
 == Changelog ==
-= 2.0.1 (02 Apr 2020) =
-  * Fix an issue with v1 migrating 
-
 = 2.0.0 (31 Mar 2020) =
   * Release of a new major version of the plugin