Ticket #22101: 22101.2.diff

src/wp-includes/media.php

@@ -1701 +1701 @@
         if ( is_feed() ) {
                 $output = "\n";
                 foreach ( $attachments as $att_id => $attachment ) {
-                        $output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n";
+                        if ( ! empty( $atts['link'] ) ) {
+                                if( 'none' === $atts['link'] ) {
+                                        $output .= wp_get_attachment_image( $att_id, $atts['size'], false, $attr );
+                                } else {
+                                        $output .= wp_get_attachment_link( $att_id, $atts['size'], false );
+                                }
+                        } else {
+                                $output .= wp_get_attachment_link( $att_id, $atts['size'], true );
+                        }
+                        $output .= "\n";
                 }
                 return $output;
         }
@@ -3742 +3751 @@
                         if ( 'gallery' === $shortcode[2] ) {
                                 $srcs = array();
 
-                                $shortcode_attrs = shortcode_parse_atts( $shortcode[3] ); 
+                                $shortcode_attrs = shortcode_parse_atts( $shortcode[3] );
                                 if ( ! is_array( $shortcode_attrs ) ) {
                                         $shortcode_attrs = array();
                                 }