Merge pull request #908 from cloudinary/uat

Version 3.1.5

Author: bruckercloud

.version

@@ -1 +1 @@
-3.1.4
+3.1.5

js/inline-loader.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '25ccbb8ce37353267420');
+<?php return array('dependencies' => array(), 'version' => '980f7ffe080efd9cda16');

js/inline-loader.js

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cloudinary STABLETAG\n"
 "Report-Msgid-Bugs-To: https://github.com/cloudinary/cloudinary_wordpress\n"
-"POT-Creation-Date: 2023-08-22 09:32:35+00:00\n"
+"POT-Creation-Date: 2023-10-10 10:18:43+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -776,16 +776,16 @@ msgstr ""
 msgid "Full Size"
 msgstr ""
 
-#: php/connect/class-api.php:360
+#: php/connect/class-api.php:373
 msgid "No direct access to file system."
 msgstr ""
 
-#: php/connect/class-api.php:455
+#: php/connect/class-api.php:468
 #. translators: variable is thread name and queue size.
 msgid "Uploading remote url:  %1$s."
 msgstr ""
 
-#: php/connect/class-api.php:586
+#: php/connect/class-api.php:599
 msgid "Could not get VIP file content"
 msgstr ""
 
@@ -905,29 +905,29 @@ msgstr ""
 msgid "Attachment Display Settings"
 msgstr ""
 
-#: php/media/class-gallery.php:343 php/media/class-gallery.php:344
+#: php/media/class-gallery.php:350 php/media/class-gallery.php:351
 msgid "Gallery settings"
 msgstr ""
 
-#: php/media/class-gallery.php:352
+#: php/media/class-gallery.php:359
 msgid "Gallery Settings"
 msgstr ""
 
-#: php/media/class-gallery.php:362
+#: php/media/class-gallery.php:369
 msgid "Replace WooCommerce Gallery"
 msgstr ""
 
-#: php/media/class-gallery.php:363
+#: php/media/class-gallery.php:370
 msgid ""
 "Replace the default WooCommerce gallery with the Cloudinary Gallery on "
 "product pages."
 msgstr ""
 
-#: php/media/class-gallery.php:371
+#: php/media/class-gallery.php:378
 msgid "Cloudinary Gallery block defaults"
 msgstr ""
 
-#: php/media/class-gallery.php:374
+#: php/media/class-gallery.php:381
 msgid ""
 "The Cloudinary Gallery is available as a new block type which can be "
 "inserted to any post or page. Note, this is not available when using the "

languages/cloudinary.pot

@@ -125,7 +125,7 @@
     "minimist": "^1.2.6",
     "npm-run-all": "^4.1.5",
     "null-loader": "^4.0.1",
-    "postcss": "^8.1.6",
+    "postcss": "^8.4.31",
     "postcss-color-function": "^4.1.0",
     "postcss-import": "^13.0.0",
     "postcss-loader": "^4.0.4",

package-lock.json

@@ -1032,6 +1032,10 @@ public function convert_tags( $content, $context = 'view' ) {
 			$replacements = array_merge( $replacements, $aliases );
 		}
 
+		// Sort by length, so we replace the longest first and prevent early replacements.
+		$keys = array_map( 'strlen', array_keys( $replacements ) );
+		array_multisort( $keys, SORT_DESC, $replacements );
+
 		// Update the post meta cache.
 		if ( is_singular() ) {
 			$has_cache          = array();
@@ -1140,7 +1144,7 @@ protected function standardize_tag( $tag_element ) {
 				$local_size = filesize( get_attached_file( $tag_element['id'] ) );
 			}
 			$remote_size                           = get_post_meta( $tag_element['id'], Sync::META_KEYS['remote_size'], true );
-			$tag_element['atts']['data-filesize']  = size_format( $local_size );
+			$tag_element['atts']['data-filesize']   = size_format( $local_size );
 			$tag_element['atts']['data-optsize']   = size_format( $remote_size );
 			$tag_element['atts']['data-optformat'] = get_post_meta( $tag_element['id'], Sync::META_KEYS['remote_format'], true );
 			if ( ! empty( $local_size ) && ! empty( $remote_size ) ) {
@@ -1154,6 +1158,29 @@ protected function standardize_tag( $tag_element ) {
 
 		$tag_element['atts']['data-version'] = $this->media->get_cloudinary_version( $tag_element['id'] );
 
+		/**
+		 * Bypass Cloudinary's SEO URLs.
+		 *
+		 * @hook   cloudinary_bypass_seo_url
+		 * @since  3.1.5
+		 *
+		 * @param $bypass_seo_url {bool} Whether to bypass SEO URLs.
+		 *
+		 * @return {bool}
+		 */
+		$bypass_seo_url = apply_filters( 'cloudinary_bypass_seo_url', false );
+
+		$tag_element['atts']['data-seo'] = ! $bypass_seo_url;
+
+		$resource_type = in_array( $tag_element['type'], array( 'image', 'video' ), true ) ? $tag_element['type'] : 'raw';
+
+		$args = array(
+			'delivery'      => $this->media->get_media_delivery( $tag_element['id'] ),
+			'resource_type' => $resource_type,
+		);
+
+		$tag_element['atts']['data-public-id'] = $this->plugin->get_component( 'connect' )->api->get_public_id( $tag_element['id'], $args );
+
 		return $tag_element;
 	}
 
@@ -1182,9 +1209,10 @@ public function rebuild_tag( $tag_element ) {
 		if ( apply_filters( 'cloudinary_apply_breakpoints', true ) ) {
 			$meta = wp_get_attachment_metadata( $tag_element['id'] );
 			if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+				$relationship = Relationship::get_relationship( $tag_element['id'] );
 				// Check overwrite.
 				$meta['overwrite_transformations'] = $tag_element['overwrite_transformations'];
-				$meta['cloudinary_id']             = $tag_element['atts']['data-public-id'];
+				$meta['cloudinary_id']             = $relationship->public_id;
 				$meta['transformations']           = $tag_element['transformations'];
 				// Add new srcset.
 				$element = wp_image_add_srcset_and_sizes( $tag_element['original'], $meta, $tag_element['id'] );
@@ -1318,7 +1346,7 @@ public function parse_element( $element ) {
 			$tag_element['height']        = ! empty( $attributes['height'] ) ? $attributes['height'] : $item['height'];
 			$attributes['data-public-id'] = $public_id;
 			$tag_element['format']        = $item['format'];
-			
+
 			if ( 'img' === $tag_element['tag'] ) {
 				// Check if this is a crop or a scale.
 				$has_size = $this->media->get_size_from_url( $this->sanitize_url( $raw_url ) );