Ticket #36084: 36084.3.diff

src/wp-admin/includes/media.php

@@ -121 +121 @@
 
         $html = get_image_tag($id, $alt, '', $align, $size);
 
-        if ( ! $rel ) {
-                $rel = ' rel="attachment wp-att-' . esc_attr( $id ) . '"';
-        } else {
-                $rel = ' rel="' . esc_attr( $rel ) . '"';
-        }
+        $rel = $rel ? ' rel="' . esc_attr( $rel ) . '"' :  '';
 
         if ( $url )
                 $html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
@@ -1166 +1162 @@
                 $align = !empty($attachment['align']) ? $attachment['align'] : 'none';
                 $size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
                 $alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
-                $rel = ( $url == get_attachment_link($attachment_id) );
+                $rel = '';
+                if ( strpos( $url, 'attachment_id') || $url == get_attachment_link($attachment_id) ) {
+                        $rel = 'attachment wp-att-' . $id;
+                }
 
                 return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
         }

tests/phpunit/tests/media.php

@@ -1481 +1481 @@
 
                 $this->assertSame( $expected, $actual );
         }
+
+        /**
+         * @ticket 36084
+         */
+        function test_get_image_send_to_editor_defaults() {
+                $id      = self::$large_id;
+                $caption = '';
+                $title   = 'A test title value.';
+                $align   = 'left';
+
+                // Calculate attachment data (default is medium).
+                $attachment = wp_get_attachment_image_src( $id, 'medium' );
+
+                $html = '<img src="%1$s" alt="" width="%2$d" height="%3$d" class="align%4$s size-medium wp-image-%5$d" />';
+                $expected = sprintf( $html, $attachment[0], $attachment[1], $attachment[2], $align, $id );
+
+                $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align ) );
+
+                $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align ) );
+        }
+
+        /**
+         * @ticket 36084
+         */
+        function test_get_image_send_to_editor_defaults_with_optional_params() {
+                $id      = self::$large_id;
+                $caption = 'A test caption.';
+                $title   = 'A test title value.';
+                $align   = 'left';
+                $url     = get_permalink( $id );
+                $rel     = 'nofollow';
+                $size    = 'thumbnail';
+                $alt     = 'An example alt value.';
+
+                // Calculate attachment data.
+                $attachment = wp_get_attachment_image_src( $id, $size );
+
+                $html = '<a href="%1$s" rel="%2$s"><img src="%3$s" alt="%4$s" width="%5$d" height="%6$d" class="size-%8$s wp-image-%9$d" /></a>';
+                $html = '[caption id="attachment_%9$d" align="align%7$s" width="%5$d"]' . $html . ' %10$s[/caption]';
+
+                $expected = sprintf( $html, $url, $rel, $attachment[0], $alt, $attachment[1], $attachment[2], $align, $size, $id, $caption );
+
+                $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt ) );
+        }
+
+        /**
+         * @ticket 36084
+         */
+        function test_get_image_send_to_editor_defaults_no_caption_no_rel() {
+                $id      = self::$large_id;
+                $caption = '';
+                $title   = 'A test title value.';
+                $align   = 'left';
+                $url     = get_permalink( $id );
+                $rel     = '';
+                $size    = 'thumbnail';
+                $alt     = 'An example alt value.';
+
+                // Calculate attachment data.
+                $attachment = wp_get_attachment_image_src( $id, $size );
+
+                $html = '<a href="%1$s"><img src="%2$s" alt="%3$s" width="%4$d" height="%5$d" class="align%6$s size-%7$s wp-image-%8$d" /></a>';
+
+                $expected = sprintf( $html, $url, $attachment[0], $alt, $attachment[1], $attachment[2], $align, $size, $id );
+
+                $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt ) );
+        }
 }