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

Timestamp:

09/20/2017 07:44:13 PM (8 years ago)

Author:

westonruter

Message:

Widgets: Omit attributes from an Image widget's link when they are empty.

Props subrataemfluence, Nenad Obradovic, westonruter.
See #39993.
Fixes #41919.

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

@@ -241 +241 @@
 
         if ( $url ) {
-            $image = sprintf(
-                '<a href="%1$s" class="%2$s" rel="%3$s" target="%4$s">%5$s</a>',
-                esc_url( $url ),
-                esc_attr( $instance['link_classes'] ),
-                esc_attr( $instance['link_rel'] ),
-                ! empty( $instance['link_target_blank'] ) ? '_blank' : '',
-                $image
-            );
+            $link = sprintf( '<a href="%s"', esc_url( $url ) );
+            if ( ! empty( $instance['link_classes'] ) ) {
+                $link .= sprintf( ' class="%s"', esc_attr( $instance['link_classes'] ) );
+            }
+            if ( ! empty( $instance['link_rel'] ) ) {
+                $link .= sprintf( ' rel="%s"', esc_attr( $instance['link_rel'] ) );
+            }
+            if ( ! empty( $instance['link_target_blank'] ) ) {
+                $link .= ' target="_blank"';
+            }
+            $link .= '>';
+            $link .= $image;
+            $link .= '</a>';
+            $image = $link;
         }