From 19779e6302eda2861fd14f80d7f8e9f4378e83da Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 21 Jul 2020 23:14:06 +0000 Subject: [PATCH] Widgets: Make sure image widgets with custom image size render captions. Props kasparsd, JavierCasares, audrasjb. Fixes #50160. Built from https://develop.svn.wordpress.org/trunk@48557 git-svn-id: http://core.svn.wordpress.org/trunk@48319 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-includes/widgets/class-wp-widget-media-image.php | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index dc9e033f29..7af883bc02 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta3-48556'; +$wp_version = '5.5-beta3-48557'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-media-image.php b/wp-includes/widgets/class-wp-widget-media-image.php index 9496176959..01b7bae394 100644 --- a/wp-includes/widgets/class-wp-widget-media-image.php +++ b/wp-includes/widgets/class-wp-widget-media-image.php @@ -184,9 +184,11 @@ class WP_Widget_Media_Image extends WP_Widget_Media { ); $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 = ''; if ( ! isset( $instance['caption'] ) ) { @@ -208,16 +210,19 @@ class WP_Widget_Media_Image extends WP_Widget_Media { } $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 { if ( empty( $instance['url'] ) ) { return;