From d87a8c74faa230803bc562e389fffb9b493d93ee Mon Sep 17 00:00:00 2001 From: Marco Pereirinha Date: Tue, 3 May 2022 11:18:58 +0100 Subject: [PATCH] Include the `cld_param` transformations on default breakpoints --- php/class-delivery.php | 1 + php/class-media.php | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/php/class-delivery.php b/php/class-delivery.php index a1d550426..c746bdf7d 100644 --- a/php/class-delivery.php +++ b/php/class-delivery.php @@ -1075,6 +1075,7 @@ public function rebuild_tag( $tag_element ) { // Check overwrite. $meta['overwrite_transformations'] = $tag_element['overwrite_transformations']; $meta['cloudinary_id'] = $tag_element['atts']['data-public-id']; + $meta['transformations'] = $tag_element['transformations']; // Add new srcset. $element = wp_image_add_srcset_and_sizes( $tag_element['original'], $meta, $tag_element['id'] ); diff --git a/php/class-media.php b/php/class-media.php index 58247abbb..017cb55eb 100644 --- a/php/class-media.php +++ b/php/class-media.php @@ -1707,9 +1707,14 @@ public function image_srcset( $sources, $size_array, $image_src, $image_meta, $a return $sources; // Return WordPress default sources. } // Get transformations if any. - $transformations = $this->get_post_meta( $attachment_id, Sync::META_KEYS['transformation'], true ); - // Use Cloudinary breakpoints for same ratio. + $transformations = (array) $this->get_post_meta( $attachment_id, Sync::META_KEYS['transformation'], true ); + + // For cases where transformations are added via cld_params. + if ( ! empty( $image_meta['transformations'] ) ) { + $transformations = array_filter( array_merge( $transformations, $image_meta['transformations'] ) ); + } + // Use Cloudinary breakpoints for same ratio. $image_meta['overwrite_transformations'] = ! empty( $image_meta['overwrite_transformations'] ) ? $image_meta['overwrite_transformations'] : false; if ( 'on' === $this->settings->get_setting( 'enable_breakpoints' )->get_value() && wp_image_matches_ratio( $image_meta['width'], $image_meta['height'], $size_array[0], $size_array[1] ) ) {