Changeset 23992

Timestamp:

04/14/2013 04:59:52 PM (11 years ago)

Author:

markjaquith

Message:

Link post format images if a URL is provided. Make the URL available via get_the_post_format_url().

props wonderboymusic, obenland. fixes #23964.

Location:

trunk/wp-includes

Files:

• media.php (modified) (4 diffs)
• post-formats.php (modified) (1 diff)

trunk/wp-includes/media.php

@@ -2401 +2401 @@
 
     $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;
     }
@@ -2413 +2418 @@
         $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 );
+            }
         }
 
@@ -2444 +2452 @@
 
         $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;
     }
@@ -2453 +2462 @@
         $html = reset( $htmls );
         $post->split_content = $content;
-        $post->format_content = $html;
+        $post->format_content = sprintf( $link_fmt, $html );
         return $post->format_content;
     }

trunk/wp-includes/post-formats.php

@@ -708 +708 @@
         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'] ) )