Merge branch 'UAT' into revert-133-feature/unique-filesnames

Author: pereirinha

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

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

@@ -368,6 +368,7 @@ public function prepare_upload( $post, $down_sync = false ) {
 					if ( true === $down_sync ) {
 						$download = $this->plugin->components['sync']->managers['download']->down_sync( $post->ID );
 						if ( is_wp_error( $download ) ) {
+							delete_post_meta( $post->ID, Sync::META_KEYS['downloading'] );
 							update_post_meta( $post->ID, Sync::META_KEYS['sync_error'], $download->get_error_message() );
 
 							return new \WP_Error( 'attachment_download_error', $download->get_error_message() );
@@ -619,6 +620,7 @@ public function push_attachments( $attachments ) {
 				$error           = $result->get_error_message();
 				$stats['fail'][] = $error;
 				$media->update_post_meta( $attachment->ID, Sync::META_KEYS['sync_error'], $error );
+				delete_post_meta( $attachment->ID, Sync::META_KEYS['syncing'] );
 				continue;
 			}
 

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

@@ -140,6 +140,7 @@ public function mark( $id, $type = 'done' ) {
 					$queue[ $type ][] = '<div>' . basename( $file ) . ': ' . $state->get_error_message() . '</div>';
 					// Add a flag that this file had an error as to not try process it again.
 					update_post_meta( $id, Sync::META_KEYS['sync_error'], $state->get_error_message() );
+					delete_post_meta( $id, Sync::META_KEYS['syncing'], $state->get_error_message() );
 				}
 			} else {
 				if ( ! in_array( $id, $queue[ $type ], true ) ) {