Changeset 54812 for branches/6.1/src/wp-includes/blocks/post-featured-image.php

Timestamp:

11/11/2022 02:54:01 PM (2 years ago)

Author:

desrosj

Message:

Editor: Update block editor packages to the latest patch releases.

This updates the block editor related npm dependencies to their latest patch versions ahead of WordPress 6.1.1.

For a full list of what’s included in this update, see ​https://github.com/WordPress/gutenberg/compare/432ed388f8d0614f9de775738b24b0ea96664715...6566f5fe9ece6ad5ae550349d3b1f0944a011040.

Props aaronrobertshaw, ntsekouras, bernhard-reiter, ramonopoly, isabel_brison, andrewserong, get_dave, scruffian, andraganescu, talldanwp, mciampini, noisysocks, cbravobernal, bph, tyxla, ellatrix, czapla, mcsf, ironprogrammer, wildworks, peterwilsoncc, mamaduka, mikachan, spacedmonkey, cybr, youknowriad, alexstine, aristath, kevin940726, ndiego, 0mirka00, poena, joen, ryankienstra, desrosj, vtad, nithins53, audrasjb, kacper3355, sabernhardt.
Merges [54811] to the 6.1 branch.
Fixes #57038, #56818, #56955, #56923.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-includes/blocks/post-featured-image.php (modified) (2 diffs)

branches/6.1/src/wp-includes/blocks/post-featured-image.php

@@ -30 +30 @@
     }
 
+    if ( ! empty( $attributes['height'] ) ) {
+        $extra_styles = "height:{$attributes['height']};";
+        if ( ! empty( $attributes['scale'] ) ) {
+            $extra_styles .= "object-fit:{$attributes['scale']};";
+        }
+        $attr['style'] = empty( $attr['style'] ) ? $extra_styles : $attr['style'] . $extra_styles;
+    }
+
     $featured_image = get_the_post_thumbnail( $post_ID, $size_slug, $attr );
     if ( ! $featured_image ) {
         return '';
     }
-    $wrapper_attributes = get_block_wrapper_attributes();
     if ( $is_link ) {
         $link_target    = $attributes['linkTarget'];
@@ -50 +57 @@
     }
 
-    $has_width  = ! empty( $attributes['width'] );
-    $has_height = ! empty( $attributes['height'] );
-    if ( ! $has_height && ! $has_width ) {
-        return "<figure {$wrapper_attributes}>{$featured_image}</figure>";
-    }
-
-    if ( $has_width ) {
-        $wrapper_attributes = get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) );
-    }
-
-    if ( $has_height ) {
-        $image_styles = "height:{$attributes['height']};";
-        if ( ! empty( $attributes['scale'] ) ) {
-            $image_styles .= "object-fit:{$attributes['scale']};";
-        }
-        $featured_image = str_replace( '<img ', '<img style="' . esc_attr( safecss_filter_attr( $image_styles ) ) . '" ', $featured_image );
-    }
+    $wrapper_attributes = empty( $attributes['width'] )
+        ? get_block_wrapper_attributes()
+        : get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) );
 
     return "<figure {$wrapper_attributes}>{$featured_image}</figure>";