Changeset 53381 for branches/6.0/src/wp-includes/blocks/cover.php

Timestamp:

05/10/2022 04:20:59 PM (4 years ago)

Author:

hellofromTonya

Message:

Editor: Update WordPress packages for 6.0 RC 2.

[53377] Included cherry-picked commits from the Gutenberg plugin that fix bugs discovered after WordPress 6.0 RC 1.

[53378] Includes cherry-picked commit from the Gutenberg plugin that fix a bug discovered just before WordPress 6.0 RC 2.

Props zieladam, ndiego, kebbet, hellofromTonya.
Merges [53377] and [53378] to the 6.0 branch.
Fixes #55567.

Location:

branches/6.0

Files:

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

branches/6.0/src/wp-includes/blocks/cover.php

@@ -15 +15 @@
  */
 function render_block_core_cover( $attributes, $content ) {
-        if ( false === $attributes['useFeaturedImage'] ) {
+        if ( 'image' !== $attributes['backgroundType'] || false === $attributes['useFeaturedImage'] ) {
                 return $content;
         }
 
-        $current_featured_image = get_the_post_thumbnail_url();
+        if ( ! ( $attributes['hasParallax'] || $attributes['isRepeated'] ) ) {
+                $attr = array(
+                        'class'           => 'wp-block-cover__image-background',
+                        'data-object-fit' => 'cover',
+                );
 
-        if ( false === $current_featured_image ) {
-                return $content;
-        }
-
-        $is_img_element      = ! ( $attributes['hasParallax'] || $attributes['isRepeated'] );
-        $is_image_background = 'image' === $attributes['backgroundType'];
-
-        if ( $is_image_background && ! $is_img_element ) {
-                $content = preg_replace(
-                        '/class=\".*?\"/',
-                        '${0} style="background-image:url(' . esc_url( $current_featured_image ) . ')"',
-                        $content,
-                        1
-                );
-        }
-
-        if ( $is_image_background && $is_img_element ) {
-                $object_position = '';
                 if ( isset( $attributes['focalPoint'] ) ) {
-                        $object_position = round( $attributes['focalPoint']['x'] * 100 ) . '%' . ' ' .
-                        round( $attributes['focalPoint']['y'] * 100 ) . '%';
+                        $object_position              = round( $attributes['focalPoint']['x'] * 100 ) . '%' . ' ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
+                        $attr['data-object-position'] = $object_position;
+                        $attr['style']                = 'object-position: ' . $object_position;
                 }
 
-                $image_template = '<img
-                        class="wp-block-cover__image-background"
-                        alt="%s"
-                        src="%s"
-                        style="object-position: %s"
-                        data-object-fit="cover"
-                        data-object-position="%s"
-                />';
-
-                $image = sprintf(
-                        $image_template,
-                        esc_attr( get_the_post_thumbnail_caption() ),
-                        esc_url( $current_featured_image ),
-                        esc_attr( $object_position ),
-                        esc_attr( $object_position )
-                );
+                $image = get_the_post_thumbnail( null, 'post-thumbnail', $attr );
 
                 $content = str_replace(
@@ -67 +39 @@
                 );
 
+        } else {
+                if ( in_the_loop() ) {
+                        update_post_thumbnail_cache();
+                }
+                $current_featured_image = get_the_post_thumbnail_url();
+                $content                = preg_replace(
+                        '/class=\".*?\"/',
+                        '${0} style="background-image:url(' . esc_url( $current_featured_image ) . ')"',
+                        $content,
+                        1
+                );
         }