Ticket #24452: 24452.patch

wp-includes/media.php

@@ -2067 +2067 @@
         if ( ! isset( $post->format_content ) )
                 $post->format_content = array();
 
-        $count = 1;
-
-        if ( has_post_format( $type, $post ) ) {
-                $meta = get_post_format_meta( $post->ID );
-                if ( ! empty( $meta[$type . '_embed'] ) ) {
-                        $value = $meta[$type . '_embed'];
-                        if ( is_integer( $value ) ) {
-                                $url = wp_get_attachment_url( $value );
-                                $shortcode = sprintf( '[%s src="%s"]', $type, $url );
-                        } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) {
-                                $shortcode = $value;
-                        } elseif ( preg_match( '#<[^>]+>#', $value ) ) {
-                                $post->format_content[ $cache_key ] = $value;
-                                return $post->format_content[ $cache_key ];
-                        } elseif ( 0 === strpos( $value, 'http' ) ) {
-                                $post->split_content = str_replace( $value, '', $post->post_content, $count );
-                                if ( strstr( $value, home_url() ) ) {
-                                        $shortcode = sprintf( '[%s src="%s"]', $type, $value );
-                                } else {
-                                        $post->format_content[ $cache_key ] = $wp_embed->autoembed( $value );
-                                        return $post->format_content[ $cache_key ];
-                                }
-                        }
-
-                        if ( ! empty( $shortcode ) ) {
-                                $post->format_content[ $cache_key ] = do_shortcode( $shortcode );
-                                return $post->format_content[ $cache_key ];
-                        }
-                }
-        }
-
         // these functions expect a reference, so we should make a copy of post content to avoid changing it
         $content = $post->post_content;
 
@@ -2438 +2407 @@
                 $post->format_content = array();
 
         $matched = false;
-        $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'] ) ) {
-                if ( is_numeric( $meta['image'] ) ) {
-                        $image = wp_get_attachment_image( absint( $meta['image'] ), $attached_size );
-                        // wrap image in <a>
-                        if ( ! empty( $meta['url'] ) )
-                                $image = sprintf( $link_fmt, $image );
-                } elseif ( has_shortcode( $meta['image'], 'caption' ) ) {
-                        // wrap <img> in <a>
-                        if ( ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {
-                                $meta['image'] = preg_replace(
-                                        '#(<img[^>]+>)#',
-                                        sprintf( '<a href="%s">$1</a>', esc_url( $meta['url'] ) ),
-                                        $meta['image']
-                                );
-                        }
-
-                        $attachment_id = img_html_to_post_id( $meta['image'], $matched_html );
-                        if ( $attachment_id && $matched_html ) {
-                                $meta['image'] = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $meta['image'] );
-                                $attachment = wp_get_attachment_image_src( $attachment_id, $attached_size );
-                                $attachment_width = ( ! empty( $attachment[1] ) ) ? $attachment[1] : 0;
-
-                                if ( $attachment_width && preg_match_all( '#width=([\'"])(.+?)\1#is', $meta['image'], $matches ) && ! empty( $matches ) )
-                                        foreach ( $matches[2] as $width )
-                                                if ( $width != $attachment_width )
-                                                        $meta['image'] = str_replace( $matches[0], sprintf( 'width="%d"', $attachment_width ), $meta['image'] );
-                        }
-
-                        $image = do_shortcode( $meta['image'] );
-                } elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) ) {
-                        // not HTML, assume URL
-                        $attachment_id = attachment_url_to_postid( $meta['image'] );
-                        if ( $attachment_id )
-                                $image = wp_get_attachment_image( $attachment_id, $attached_size );
-                        else
-                                $image = sprintf( '<img src="%s" alt="" />', esc_url( $meta['image'] ) );
-                } else {
-                        // assume HTML
-                        $image = $meta['image'];
-                        $attachment_id = img_html_to_post_id( $image, $matched_html );
-                        if ( $attachment_id && $matched_html )
-                                $image = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $image );
-                }
-
-                if ( false === strpos( $image, '<a ' ) )
-                        $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
-                else
-                        $post->format_content[ $cache_key ] = $image;
-                return $post->format_content[ $cache_key ];
-        }
-
         $medias = get_attached_images( $post->ID );
         if ( ! empty( $medias ) ) {
                 $media = reset( $medias );
@@ -2544 +2457 @@
 
                 $post->split_content = $content;
                 if ( ! $matched ) {
-                        $image = wp_get_attachment_image( $media->ID, $attached_size );
-                        $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
+                        $post->format_content[ $cache_key ] = wp_get_attachment_image( $media->ID, $attached_size );
                 } else {
                         $post->format_content[ $cache_key ] = $matched;
-                        if ( ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
-                                $post->format_content[ $cache_key ] = sprintf( $link_fmt, $matched );
                 }
                 return $post->format_content[ $cache_key ];
         }
@@ -2564 +2474 @@
                         $html = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $html );
 
                 $post->split_content = $content;
-                $post->format_content[ $cache_key ] = sprintf( $link_fmt, $html );
+                $post->format_content[ $cache_key ] = $html;
                 return $post->format_content[ $cache_key ];
         }