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

Timestamp:

10/27/2017 05:04:04 AM (7 years ago)

Author:

westonruter

Message:

Widgets: Prevent showing underlying attachment excerpt as caption when empty caption value is supplied in Image widget.

Allow underlying attachment to display if caption is null.

Props miyauchi, westonruter.
See #39993.
Fixes #42350.

File:

• trunk/src/wp-includes/widgets/class-wp-widget-media-image.php (modified) (1 diff)

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

@@ -178 +178 @@
         }
         if ( $attachment ) {
-            $caption = $attachment->post_excerpt;
-            if ( $instance['caption'] ) {
+            $caption = '';
+            if ( ! isset( $instance['caption'] ) ) {
+                $caption = $attachment->post_excerpt;
+            } elseif ( trim( $instance['caption'] ) ) {
                 $caption = $instance['caption'];
             }