Ticket #24404: post-format-image-no-link.patch

wp-includes/media.php

@@ -2420 +2420 @@
  *
  * @param string $attached_size If an attached image is found, the size to display it.
  * @param WP_Post $post Optional. Used instead of global $post when passed.
+ * @param bool $link Wrap the returned image in its link, if available.
  * @return string HTML for the image. Blank string if no image is found.
  */
-function get_the_post_format_image( $attached_size = 'full', &$post = null ) {
+function get_the_post_format_image( $attached_size = 'full', &$post = null, $link = true ) {
         if ( empty( $post ) )
                 $post = get_post();
 
@@ -2430 +2431 @@
                 return '';
 
         $cache_key = "image:{$attached_size}";
+        if ( ! $link )
+                $cache_key .= '-nolink';
 
         if ( isset( $post->format_content[ $cache_key ] ) )
                 return $post->format_content[ $cache_key ];
@@ -2441 +2444 @@
         $meta = get_post_format_meta( $post->ID );
 
         $link_fmt = '%s';
-        if ( ! empty( $meta['url'] ) )
+        if ( $link && ! empty( $meta['url'] ) )
                 $link_fmt = '<a href="' . esc_url( $meta['url'] ) . '">%s</a>';
 
         if ( ! empty( $meta['image'] ) ) {
@@ -2452 +2455 @@
                                 $image = sprintf( $link_fmt, $image );
                 } elseif ( has_shortcode( $meta['image'], 'caption' ) ) {
                         // wrap <img> in <a>
-                        if ( ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {
+                        if ( $link && ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {
                                 $meta['image'] = preg_replace(
                                         '#(<img[^>]+>)#',
                                         sprintf( '<a href="%s">$1</a>', esc_url( $meta['url'] ) ),
@@ -2488 +2491 @@
                                 $image = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $image );
                 }
 
-                if ( false === strpos( $image, '<a ' ) )
+                if ( $link && false === strpos( $image, '<a ' ) )
                         $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
                 else
                         $post->format_content[ $cache_key ] = $image;
@@ -2548 +2551 @@
                         $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
                 } else {
                         $post->format_content[ $cache_key ] = $matched;
-                        if ( ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
+                        if ( $link && ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
                                 $post->format_content[ $cache_key ] = sprintf( $link_fmt, $matched );
                 }
                 return $post->format_content[ $cache_key ];