Changeset 41549

Timestamp:

09/20/2017 07:44:13 PM (9 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.

Location:

trunk

Files:

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

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;
                 }
 

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

@@ -394 +394 @@
                 $link = '<a href="' . wp_get_attachment_url( $attachment_id ) . '"';
                 $this->assertContains( $link, $output );
-                $link .= ' class=""';
-                $this->assertContains( $link, $output );
-                $link .= ' rel=""';
-                $this->assertContains( $link, $output );
-                $link .= ' target=""';
-                $this->assertContains( $link, $output );
+                $this->assertTrue( (bool) preg_match( '#<a href.*?>#', $output, $matches ) );
+                $this->assertNotContains( ' class="', $matches[0] );
+                $this->assertNotContains( ' rel="', $matches[0] );
+                $this->assertNotContains( ' target="', $matches[0] );
 
                 ob_start();
@@ -414 +412 @@
                 $this->assertContains( 'class="custom-link-class"', $output );
                 $this->assertContains( 'rel="attachment"', $output );
-                $this->assertContains( 'target=""', $output );
+                $this->assertNotContains( 'target=""', $output );
 
                 ob_start();