Merge pull request #966 from cloudinary/uat

Uat

.version

@@ -1 +1 @@
-3.1.8
+3.1.9

php/class-assets.php

@@ -1020,7 +1020,8 @@ public function get_asset( $post_id, $type = 'object' ) {
 		global $wpdb;
 
 		$wpdb->cld_table = Utils::get_relationship_table();
-		$prepare         = $wpdb->prepare( "SELECT * FROM $wpdb->cld_table WHERE post_id = %d;", (int) $post_id );
+		$media_context   = Utils::get_media_context( $post_id );
+		$prepare         = $wpdb->prepare( "SELECT * FROM $wpdb->cld_table WHERE post_id = %d AND media_context = %s;", (int) $post_id, $media_context );
 		$result          = $wpdb->get_row( $prepare, ARRAY_A ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery, WordPress.DB.PreparedSQL.NotPrepared
 
 		return $this->build_item( $result );

php/class-delivery.php

@@ -11,13 +11,9 @@
 use Cloudinary\Connect\Api;
 use Cloudinary\Media\Filter;
 use Cloudinary\Media\Global_Transformations;
-use Cloudinary\Sync;
-use Cloudinary\String_Replace;
 use Cloudinary\UI\Component\HTML;
 use Cloudinary\Delivery\Bypass;
 use Cloudinary\Relate\Relationship;
-use WP_Post;
-use Cloudinary\Utils;
 
 /**
  * Plugin Delivery class.
@@ -335,11 +331,12 @@ public function generate_signature( $attachment_id ) {
 		if ( $relationship instanceof Relationship ) {
 			$public_id = $relationship->public_id;
 		}
+
 		$sizes              = $this->get_sized( $attachment_id );
 		$settings_signature = self::get_settings_signature();
 		$relation_signature = $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['relationship'], true );
 
-		return wp_json_encode( $sizes ) . $public_id . $sql . $settings_signature . $relation_signature;
+		return wp_json_encode( $sizes ) . $public_id . $sql . $settings_signature . $relation_signature . Utils::get_media_context( $attachment_id );
 	}
 
 	/**
@@ -544,9 +541,10 @@ public static function update_size_relations_public_id( $attachment_id, $public_
 		$relationship = Relationship::get_relationship( $attachment_id );
 
 		if ( $relationship instanceof Relationship ) {
-			$relationship->public_id   = $public_id;
-			$relationship->public_hash = md5( (string) $public_id );
-			$relationship->signature   = self::get_settings_signature();
+			$relationship->public_id     = $public_id;
+			$relationship->public_hash   = md5( (string) $public_id );
+			$relationship->signature     = self::get_settings_signature();
+			$relationship->media_context = Utils::get_media_context( $attachment_id );
 			$relationship->save();
 		}
 	}
@@ -624,6 +622,7 @@ public static function create_size_relation( $attachment_id, $sized_url, $size =
 			'post_id'         => $attachment_id,
 			'parent_path'     => $parent_path,
 			'sized_url'       => $sized_url,
+			'media_context'   => Utils::get_media_context( $attachment_id ),
 			'width'           => $width_height[0] ? $width_height[0] : 0,
 			'height'          => $width_height[1] ? $width_height[1] : 0,
 			'format'          => Utils::pathinfo( $sized_url, PATHINFO_EXTENSION ),
@@ -1013,6 +1012,9 @@ public function convert_tags( $content, $context = 'view' ) {
 			$base           = $type . ':' . $url;
 			$public_id      = ! is_admin() ? $relation['public_id'] . '.' . $relation['format'] : null;
 			$cloudinary_url = $this->media->cloudinary_url( $relation['post_id'], array(), $relation['transformations'], $public_id );
+			if ( empty( $cloudinary_url ) ) {
+				continue;
+			}
 			if ( ! empty( $relation['slashed'] ) && $relation['slashed'] ) {
 				$aliases[ $base . '?' ] = addcslashes( $cloudinary_url . '&', '/' );
 				$aliases[ $base ]       = addcslashes( $cloudinary_url, '/' );

php/class-plugin.php

@@ -14,6 +14,7 @@
 use Cloudinary\Delivery\Lazy_Load;
 use Cloudinary\Delivery\Responsive_Breakpoints;
 use Cloudinary\Assets as CLD_Assets;
+use Cloudinary\Integrations\WPML;
 use Cloudinary\Media\Gallery;
 use Cloudinary\Sync\Storage;
 use Cloudinary\UI\State;
@@ -30,7 +31,7 @@ final class Plugin {
 	 *
 	 * @since   0.1
 	 *
-	 * @var Admin|CLD_Assets|Connect|Dashboard|Deactivation|Delivery|Extensions|Gallery|Lazy_Load|Media|Meta_Box|Relate|Report|Responsive_Breakpoints|REST_API|State|Storage|SVG|Sync|URL|null
+	 * @var     Admin|CLD_Assets|Connect|Dashboard|Deactivation|Delivery|Extensions|Gallery|Lazy_Load|Media|Meta_Box|Relate|Report|Responsive_Breakpoints|REST_API|State|Storage|SVG|Sync|URL[]|WPML|null
 	 */
 	public $components;
 	/**
@@ -89,29 +90,6 @@ final class Plugin {
 	 */
 	public $plugin_file;
 
-	/**
-	 * Directory in plugin containing autoloaded classes.
-	 *
-	 * @var string
-	 */
-	protected $autoload_class_dir = 'php';
-
-	/**
-	 * Autoload matches cache.
-	 *
-	 * @var array
-	 */
-	protected $autoload_matches_cache = array();
-
-	/**
-	 * Holds the list of hooks.
-	 *
-	 * @since   0.1
-	 *
-	 * @var     array
-	 */
-	public $hooks;
-
 	/**
 	 * Holds the list of keys.
 	 */
@@ -166,6 +144,7 @@ public function init() {
 		$this->components['relate']                 = new Relate( $this );
 		$this->components['metabox']                = new Meta_Box( $this );
 		$this->components['url']                    = new URL( $this );
+		$this->components['wpml']                   = new WPML( $this );
 	}
 
 	/**

php/class-report.php

@@ -212,7 +212,7 @@ public function get_attachment_data( $post_id = null ) {
 		unset( $meta[ Sync::META_KEYS['cloudinary'] ], $meta[ Sync::META_KEYS['process_log'] ], $meta['_wp_attachment_metadata'] );
 		array_walk(
 			$meta,
-			static function( &$row ) {
+			static function ( &$row ) {
 				$row = reset( $row );
 			}
 		);
@@ -226,9 +226,11 @@ static function( &$row ) {
 		}
 
 		$wpdb->cld_table = Utils::get_relationship_table();
+		$media_context   = Utils::get_media_context( $post->ID );
 		$prepare         = $wpdb->prepare(
-			"SELECT * FROM {$wpdb->cld_table} WHERE post_id = %d;",
-			$post->ID
+			"SELECT * FROM {$wpdb->cld_table} WHERE post_id = %d AND media_context = %s;",
+			$post->ID,
+			$media_context
 		);
 		$relationship    = $wpdb->get_row( $prepare ); // phpcs:ignore WordPress.DB.PreparedSQL,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching