Ticket #23965: 23965.2.diff

wp-admin/js/post-formats.js

@@ -17 +17 @@
                         description = $('.post-format-description'),
                         postTitle = $('#title');
 
-                if ( typeof container === 'undefined' )
-                        container = $('#post-body-content');
+                        if ( typeof container === 'undefined' )
+                                container = $('#post-body-content');
 
                 parent.slideUp().find('a.active').removeClass('active');
                 $this.addClass('active');
@@ -77 +77 @@
                 // Media selection
                 $('.wp-format-media-select').click(function (event) {
                         event.preventDefault();
-                        var $el = $(this), mime,
+                        var $el = $(this), mime = 'image',
                             $holder = $el.closest('.wp-format-media-holder'),
                             $field = $( '#wp_format_' + $holder.data('format') );
 

wp-includes/functions.php

@@ -3985 +3985 @@
 function get_tag_regex( $tag ) {
         if ( empty( $tag ) )
                 return;
-
-        return sprintf( '(<%1$s[^>]*(?:/?>$|>[\s\S]*?</%1$s>))', tag_escape( $tag ) );
+        return sprintf( '(<%1$s[^>]*(?:/?>\s*$|>[\s\S]*?</%1$s>))', tag_escape( $tag ) );
 }

wp-includes/media.php

@@ -2399 +2399 @@
         if ( isset( $post->format_content ) )
                 return $post->format_content;
 
+        $matched = false;
         $meta = get_post_format_meta( $post->ID );
 
         $link_fmt = '%s';
@@ -2425 +2426 @@
                 $sizes = get_intermediate_image_sizes();
                 $sizes[] = 'full'; // Add original image source.
 
-                $urls = array();
+                $urls = array( get_attachment_link( $media->ID ) );
                 foreach ( $sizes as $size ) {
                         $image = wp_get_attachment_image_src( $media->ID, $size );
                         if ( $image )
@@ -2443 +2444 @@
                         foreach ( $matches as $shortcode ) {
                                 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 );
+                                                }
                                         }
                                 }
                         }
@@ -2454 +2458 @@
                         if ( preg_match_all( '#' . get_tag_regex( $tag ) . '#', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
                                 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 );
+                                                }
                                         }
                                 }
                         }
                 }
 
                 $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;
         }