Ticket #19570: 19570.25.diff

wp-admin/js/post-formats.js

@@ -118 +118 @@
                                 mediaPreview('video', url, mime);
                         } else {
                                 // set the hidden input's value
-                                $field.val(url);
+                                $field.val(id);
                                 // Show the image in the placeholder
                                 $el.html('<img src="' + url + '" />');
                                 $holder.removeClass('empty').show();

wp-includes/media.php

@@ -2367 +2367 @@
         if ( isset( $post->format_content ) )
                 return $post->format_content;
 
+        $meta = get_post_format_meta( $post->ID );
+        if ( ! empty( $meta['image'] ) ) {
+                $post->format_content = wp_get_attachment_image( $meta['image'], $attached_size );
+                return $post->format_content;
+        }
+
         $medias = get_attached_images();
         if ( ! empty( $medias ) ) {
                 $media = reset( $medias );

wp-includes/post-formats.php

@@ -308 +308 @@
         $show_content = true;
         $format_output = '';
         $meta = get_post_format_meta( $post->ID );
-        // passed by ref in preg_match()
-        $matches = array();
 
         switch ( $format ) {
                 case 'link':
@@ -341 +339 @@
                         }
                         break;
 
+                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 ) ) {
+                                        $image_html = sprintf(
+                                                '<img %ssrc="%s" alt="" />',
+                                                empty( $compat['image_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['image_class'] ) ),
+                                                $image
+                                        );
+                                        if ( empty( $meta['url'] ) ) {
+                                                $format_output .= $image_html;
+                                        } else {
+                                                $format_output .= sprintf(
+                                                        '<a href="%s">%s</a>',
+                                                        esc_url( $meta['url'] ),
+                                                        $image_html
+                                                );
+                                        }
+                                }
+                        }
+                        break;
+
                 case 'quote':
                         if ( ! empty( $meta['quote'] ) && ! stristr( $content, $meta['quote'] ) ) {
                                 $quote = sprintf( '<blockquote>%s</blockquote>', wpautop( $meta['quote'] ) );
                                 if ( ! empty( $meta['quote_source'] ) ) {
-                                        $source = ( empty( $quote_meta['url'] ) ) ? $meta['quote_source'] : sprintf( '<a href="%s">%s</a>', esc_url( $meta['url'] ), $meta['quote_source'] );
+                                        $source = ( empty( $meta['url'] ) ) ? $meta['quote_source'] : sprintf( '<a href="%s">%s</a>', esc_url( $meta['url'] ), $meta['quote_source'] );
                                         $quote .= sprintf( '<figcaption class="quote-caption">%s</figcaption>', $source );
                                 }
                                 $format_output .= sprintf( '<figure class="quote">%s</figure>', $quote );