Changeset 24066 for trunk/wp-includes/media.php

Timestamp:

04/22/2013 10:11:42 PM (13 years ago)

Author:

markjaquith

Message:

Multiple improvements to image post format insertion and display.

• get_tag_regex() altered based on Unit Tests.
• Changes to post-formats.js to provide size and link context during image selection.
• Captions are now output in the_post_format_image() when present.
• The meta value for url is respected for the image post format when the HTML in the image meta doesn't include a link

props wonderboymusic. fixes #23965, #23964. see #24147, #24046.

File:

• trunk/wp-includes/media.php (modified) (7 diffs)

trunk/wp-includes/media.php

@@ -1967 +1967 @@
     foreach ( array( $type, 'object', 'embed', 'iframe' ) as $tag ) {
         if ( preg_match( '#' . get_tag_regex( $tag ) . '#', $content, $matches ) ) {
-            $html[] = $matches[1];
+            $html[] = $matches[0];
             if ( $remove )
                 $content = str_replace( $matches[0], '', $content );
@@ -2210 +2210 @@
     $captions = array();
 
-    if ( $remove && preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
+    if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
         foreach ( $matches as $shortcode ) {
-            if ( 'caption' === $shortcode[2] )
+            if ( 'caption' === $shortcode[2] ) {
                 $captions[] = $shortcode[0];
-        }
-    }
-
-    if ( preg_match_all( '#<img[^>]+/?>#i', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
-        foreach ( $matches as $tag ) {
-            $count = 1;
-            if ( $remove ) {
+                if ( $html )
+                    $tags[] = do_shortcode( $shortcode[0] );
+            }
+
+            if ( $limit > 0 && count( $tags ) >= $limit )
+                break;
+        }
+    }
+
+    foreach ( array( 'a', 'img' ) as $tag ) {
+        if ( preg_match_all( '#' . get_tag_regex( $tag ) .  '#i', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
+            foreach ( $matches as $node ) {
+                if ( ! strstr( $node[0], '<img ' ) )
+                    continue;
+
+                $count = 1;
+                $found = false;
+
                 foreach ( $captions as $caption ) {
-                    if ( strstr( $caption, $tag[0] ) ) {
-                        $content = str_replace( $caption, '', $content, $count );
+                    if ( strstr( $caption, $node[0] ) ) {
+                        $found = true;
+                        if ( $remove )
+                            $content = str_replace( $caption, '', $content, $count );
                     }
                 }
 
-                $content = str_replace( $tag[0], '', $content, $count );
+                if ( $remove )
+                    $content = str_replace( $node[0], '', $content, $count );
+
+                if ( ! $found )
+                    $tags[] = $node[0];
+
+                if ( $limit > 0 && count( $tags ) >= $limit )
+                    break 2;
             }
-
-            $tags[] = $tag[0];
-
-            if ( $limit > 0 && count( $tags ) >= $limit )
-                break;
         }
     }
@@ -2401 +2416 @@
         return $post->format_content;
 
+    $matched = false;
     $meta = get_post_format_meta( $post->ID );
 
@@ -2408 +2424 @@
 
     if ( ! empty( $meta['image'] ) ) {
-        if ( is_numeric( $meta['image'] ) )
+        if ( is_numeric( $meta['image'] ) ) {
             $image = wp_get_attachment_image( absint( $meta['image'] ), $attached_size );
-        elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $meta['image'] ) )
+            // wrap image in <a>
+            if ( ! empty( $meta['url'] ) )
+                $image = sprint( $link_fmt, $image );
+        } elseif ( has_shortcode( $meta['image'], 'gallery' ) ) {
+            // 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']
+                );
+            }
             $image = do_shortcode( $meta['image'] );
-        elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) )
+        } elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) ) {
+            // not HTML, assume URL
             $image = sprintf( '<img src="%s" alt="" />', esc_url( $meta['image'] ) );
+        } else {
+            // assume HTML
+            $image = $meta['image'];
+        }
+
+        if ( false === strpos( $image, '<a ' ) )
+            $post->format_content = sprintf( $link_fmt, $image );
         else
-            $image = $meta['image'];
-
-        $post->format_content = sprintf( $link_fmt, $image );
+            $post->format_content = $image;
         return $post->format_content;
     }
@@ -2445 +2478 @@
                 if ( 'caption' === $shortcode[2] ) {
                     foreach ( $urls as $url ) {
-                        if ( strstr( $shortcode[0], $url ) )
+                        if ( strstr( $shortcode[0], $url ) ) {
+                            if ( ! $matched )
+                                $matched = do_shortcode( $shortcode[0] );
                             $content = str_replace( $shortcode[0], '', $content, $count );
+                        }
                     }
                 }
@@ -2456 +2492 @@
                 foreach ( $matches as $match ) {
                     foreach ( $urls as $url ) {
-                        if ( strstr( $match[0], $url ) )
+                        if ( strstr( $match[0], $url ) ) {
+                            if ( ! $matched )
+                                $matched = $match[0];
                             $content = str_replace( $match[0], '', $content, $count );
+                        }
                     }
                 }
@@ -2464 +2503 @@
 
         $post->split_content = $content;
-        $image = wp_get_attachment_image( $media->ID, $attached_size );
-        $post->format_content = sprintf( $link_fmt, $image );
+        if ( ! $matched ) {
+            $image = wp_get_attachment_image( $media->ID, $attached_size );
+            $post->format_content = sprintf( $link_fmt, $image );
+        } else {
+            $post->format_content = $matched;
+            if ( ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
+                $post->format_content = sprintf( $link_fmt, $matched );
+        }
         return $post->format_content;
     }