Changeset 48557

Timestamp:

07/21/2020 11:12:22 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Widgets: Make sure image widgets with custom image size render captions.

Props kasparsd, JavierCasares, audrasjb.
Fixes #50160.

Location:

trunk

Files:

• src/wp-includes/widgets/class-wp-widget-media-image.php (modified) (2 diffs)
• tests/phpunit/tests/widgets/media-image-widget.php (modified) (1 diff)

trunk/src/wp-includes/widgets/class-wp-widget-media-image.php

@@ -185 +185 @@
 
         $attachment = null;
+
         if ( $this->is_attachment_with_mime_type( $instance['attachment_id'], $this->widget_options['mime_type'] ) ) {
             $attachment = get_post( $instance['attachment_id'] );
         }
+
         if ( $attachment ) {
             $caption = '';
@@ -209 +211 @@
 
             $size = $instance['size'];
+
             if ( 'custom' === $size || ! in_array( $size, array_merge( get_intermediate_image_sizes(), array( 'full' ) ), true ) ) {
-                $size = array( $instance['width'], $instance['height'] );
-            }
+                $size  = array( $instance['width'], $instance['height'] );
+                $width = $instance['width'];
+            } else {
+                $caption_size = _wp_get_image_size_from_meta( $instance['size'], wp_get_attachment_metadata( $attachment->ID ) );
+                $width        = empty( $caption_size[0] ) ? 0 : $caption_size[0];
+            }
+
             $image_attributes['class'] .= sprintf( ' attachment-%1$s size-%1$s', is_array( $size ) ? join( 'x', $size ) : $size );
 
             $image = wp_get_attachment_image( $attachment->ID, $size, false, $image_attributes );
-
-            $caption_size = _wp_get_image_size_from_meta( $instance['size'], wp_get_attachment_metadata( $attachment->ID ) );
-            $width        = empty( $caption_size[0] ) ? 0 : $caption_size[0];
 
         } else {

trunk/tests/phpunit/tests/widgets/media-image-widget.php

@@ -586 +586 @@
         $this->assertContains( 'class="wp-caption alignnone"', $output );
         $this->assertContains( '<p class="wp-caption-text">Custom caption</p>', $output );
+
+        // Attachments with custom sizes can render captions.
+        ob_start();
+        $widget->render_media(
+            array(
+                'attachment_id' => $attachment_id,
+                'size'          => 'custom',
+                'width'         => '300',
+                'height'        => '200',
+                'caption'       => 'Caption for an image with custom size',
+            )
+        );
+        $output = ob_get_clean();
+        $this->assertContains( 'style="width: 310px"', $output );
+        $this->assertContains( '<p class="wp-caption-text">Caption for an image with custom size</p>', $output );
     }