Changeset 24078

Timestamp:

04/25/2013 02:18:49 AM (12 years ago)

Author:

markjaquith

Message:

Fix mangled image output in compat function.

props wonderboymusic. see #24175.

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/media.php

@@ -2429 +2429 @@
             if ( ! empty( $meta['url'] ) )
                 $image = sprint( $link_fmt, $image );
-        } elseif ( has_shortcode( $meta['image'], 'gallery' ) ) {
+        } elseif ( has_shortcode( $meta['image'], 'caption' ) ) {
             // wrap <img> in <a>
             if ( ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {

trunk/wp-includes/post-formats.php

@@ -375 +375 @@
         case 'image':
             if ( ! empty( $meta['image'] ) ) {
-                $image = is_numeric( $meta['image'] ) ? wp_get_attachment_url( $meta['image'] ) : $meta['image'];
-
-                if ( ! empty( $image ) && ! stristr( $content, $image ) ) {
-                    if ( false === strpos( $image, '<a ' ) ) {
-                        $image_html = sprintf(
+
+                if ( 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']
+                        );
+                    }
+                    $format_output .= do_shortcode( $meta['image'] );
+                } else {
+
+                    if ( is_numeric( $meta['image'] ) ) {
+                        $image = wp_get_attachment_image( absint( $meta['image'] ), 'full' );
+                    } elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) ) {
+                        // not HTML, assume URL
+                        $image = sprintf(
                             '<img %ssrc="%s" alt="" />',
                             empty( $compat['image_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['image_class'] ) ),
+                            esc_url( $meta['image'] )
+                        );
+                    } else {
+                        // assume HTML
+                        $image = $meta['image'];
+                    }
+
+                    if ( ! empty( $meta['url'] ) && false === strpos( $image, '<a ' ) ) {
+                        $format_output .= sprintf(
+                            '<a href="%s">%s</a>',
+                            esc_url( $meta['url'] ),
                             $image
                         );
                     } else {
-                        $image_html = $image;
-                    }
-
-                    if ( empty( $meta['url'] ) || false !== strpos( $image, '<a ' ) ) {
-                        $format_output .= $image_html;
-                    } else {
-                        $format_output .= sprintf(
-                            '<a href="%s">%s</a>',
-                            esc_url( $meta['url'] ),
-                            $image_html
-                        );
+                        $format_output .= $image;
                     }
                 }