Ticket #23965: 23965.diff

wp-admin/includes/post-formats.php

@@ -76 +76 @@
                                 _e( 'Video URL' );
                 ?></label>
                 <textarea id="wp_format_video" type="text" name="_wp_format_video" class="widefat"><?php esc_html_e( $format_meta['video'] ); ?></textarea>
-                <div data-format="video" class="wp-format-media-holder hide-if-no-js<?php if ( ! $image ) echo ' empty'; ?>">
+                <div data-format="video" class="wp-format-media-holder hide-if-no-js<?php if ( ! $show_video_preview ) echo ' empty'; ?>">
                         <a href="#" class="wp-format-media-select"
                                 data-choose="<?php esc_attr_e( 'Choose a Video' ); ?>"
                                 data-update="<?php esc_attr_e( 'Select Video' ); ?>">
@@ -114 +114 @@
                         else
                                 _e( 'Audio URL' );
                 ?></label>
-                <textarea id="wp_format_audio" name="_wp_format_audio" class="widefat"><?php esc_html_e( $format_meta['audio'] );
-?></textarea>
-                <div data-format="audio" class="wp-format-media-holder hide-if-no-js<?php if ( empty( $format_meta['audio'] ) ) echo ' empty'; ?>">
+                <textarea id="wp_format_audio" name="_wp_format_audio" class="widefat"><?php esc_html_e( $format_meta['audio'] ); ?></textarea>
+                <div data-format="audio" class="wp-format-media-holder hide-if-no-js<?php if ( ! $show_audio_preview ) echo ' empty'; ?>">
                         <a href="#" class="wp-format-media-select" data-choose="<?php esc_attr_e( 'Choose Audio' ); ?>" data-update="<?php esc_attr_e( 'Select Audio' ); ?>">
                                 <?php _e( 'Select Audio From Media Library' ) ?>
                         </a>

wp-admin/js/post-formats.js

@@ -19 +19 @@
                                 format = $this.data('wp-format'),
                                 description = $('.post-format-description');
 
-                if ( typeof container === 'undefined' )
-                        container = $('#post-body-content');
+                        if ( typeof container === 'undefined' )
+                                container = $('#post-body-content');
 
                         // Already on this post format. Bail.
                         if ( format === postFormats.currentPostFormat )
@@ -68 +68 @@
                 // Media selection
                 $('.wp-format-media-select').click(function (event) {
                         event.preventDefault();
-                        var $el = $(this), $holder, $field, mime = 'image', menu = '',
+                        var $el = $(this), $holder, $field, mime = 'image',
                             $holder = $el.closest('.wp-format-media-holder'),
                             $field = $( '#wp_format_' + $holder.data('format') );
 
@@ -82 +82 @@
                         }
 
                         // If the media frame already exists, reopen it.
-                        if ( mediaFrame && lastMimeType === mime && lastMenu === menu ) {
+                        if ( mediaFrame && lastMimeType === mime ) {
                                 mediaFrame.open();
                                 return;
                         }
 
                         lastMimeType = mime;
-                        lastMenu = menu;
 
                         // Create the media frame.
                         mediaFrame = wp.media.frames.formatMedia = wp.media({
                                 // Set the title of the modal.
                                 title: $el.data('choose'),
 
-                                // Set the menu sidebar of the modal, if applicable
-                                toolbar: menu,
-
                                 // Tell the modal to show only items matching the current mime type.
                                 library: {
                                         type: mime

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';
@@ -2415 +2416 @@
                 $media = reset( $medias );
                 $sizes = get_intermediate_image_sizes();
 
-                $urls = array();
+                $urls = array( get_attachment_link( $media->ID ) );
                 foreach ( $sizes as $size ) {
                         $image = wp_get_attachment_image_src( $media->ID, $size );
-                        if ( $image ) {
+                        if ( $image )
                                 $urls[] = reset( $image );
-                                $urls[] = get_attachment_link( $media->ID );
-                        }
                 }
 
                 $count = 1;
@@ -2432 +2431 @@
                         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 );
+                                                }
                                         }
                                 }
                         }
@@ -2443 +2445 @@
                         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;
         }