Ticket #23964: 23964.2.diff

wp-includes/media.php

@@ -2385 +2385 @@
                 return $post->format_content;
 
         $meta = get_post_format_meta( $post->ID );
+
+        $link_fmt = '%s';
+        if ( ! empty( $meta['url'] ) )
+                $link_fmt = '<a href="' . esc_url( $meta['url'] ) . '">%s</a>';
+
         if ( ! empty( $meta['image'] ) ) {
-                $post->format_content = wp_get_attachment_image( $meta['image'], $attached_size );
+                $post->format_content = sprintf( $link_fmt, wp_get_attachment_image( $meta['image'], $attached_size ) );
                 return $post->format_content;
         }
 
@@ -2397 +2402 @@
 
                 $urls = array();
                 foreach ( $sizes as $size ) {
-                        $urls[] = reset( wp_get_attachment_image_src( $media->ID, $size ) );
-                        $urls[] = get_attachment_link( $media->ID );
+                        $image = wp_get_attachment_image_src( $media->ID, $size );
+                        if ( $image ) {
+                                $urls[] = reset( $image );
+                                $urls[] = get_attachment_link( $media->ID );
+                        }
                 }
 
                 $count = 1;
@@ -2428 +2436 @@
                 }
 
                 $post->split_content = $content;
-                $post->format_content = wp_get_attachment_image( $media->ID, $attached_size );
+                $image = wp_get_attachment_image( $media->ID, $attached_size );
+                $post->format_content = sprintf( $link_fmt, $image );
                 return $post->format_content;
         }
 
@@ -2437 +2446 @@
         if ( ! empty( $htmls ) ) {
                 $html = reset( $htmls );
                 $post->split_content = $content;
-                $post->format_content = $html;
+                $post->format_content = sprintf( $link_fmt, $html );
                 return $post->format_content;
         }
 }

wp-includes/post-formats.php

@@ -707 +707 @@
         if ( empty( $post ) )
                 return '';
 
-        if ( in_array( get_post_format( $post->ID ), array( 'link', 'quote' ) ) ) {
+        if ( in_array( get_post_format( $post->ID ), array( 'image', 'link', 'quote' ) ) ) {
                 $meta = get_post_format_meta( $post->ID );
                 if ( ! empty( $meta['url'] ) )
                         return apply_filters( 'get_the_post_format_url', esc_url_raw( $meta['url'] ), $post );