Ticket #23593: 23593.diff

diff --git wp-includes/functions.php wp-includes/functions.php
index cbd7925..a88c843 100644
--- wp-includes/functions.php
+++ wp-includes/functions.php
@@ -3883,4 +3883,24 @@ function wp_is_stream( $path ) {
  */
 function wp_checkdate( $month, $day, $year, $source_date ) {
        return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
+}
+
+/**
+ * Return RegEx body to liberally match an opening HTML tag that:
+ * 1. Is self-closing or
+ * 2. Has no body but has a closing tag of the same name or
+ * 3. Contains a body and a closing tag of the same name
+ *
+ * Note: this RegEx does not balance inner tags and does not attempt to produce valid HTML
+ *
+ * @since 3.6.0
+ *
+ * @param string $tag An HTML tag name. Example: 'video'
+ * @return string
+ */
+function get_tag_regex( $tag ) {
+    if ( empty( $tag ) )
+        return;
+
+    return sprintf( '(<%1$s[^>]*(?:/?>$|>[\s\S]*?</%1$s>))', tag_escape( $tag ) );
 }
\ No newline at end of file
diff --git wp-includes/media.php wp-includes/media.php
index f1f3737..c90d802 100644
--- wp-includes/media.php
+++ wp-includes/media.php
@@ -1542,3 +1542,105 @@ function wp_enqueue_media( $args = array() ) {
 
        do_action( 'wp_enqueue_media' );
 }
+
+/**
+ * Retrieve images attached to the passed post
+ *
+ * @since 3.6.0
+ *
+ * @param int $post_id  Post ID
+ * @return array Found image attachments
+ */
+function get_post_images( $post_id = 0 ) {
+       $post = empty( $post_id ) ? get_post() : get_post( $post_id );
+       if ( empty( $post ) )
+               return;
+
+       $children = get_children( array(
+               'post_parent' => $post->ID,
+               'post_type' => 'attachment',
+               'post_mime_type' => 'image',
+               'posts_per_page' => -1,
+               'orderby' => 'menu_order',
+               'order' => 'ASC'
+       ) );
+
+       if ( ! empty( $children ) )
+               return $children;
+}
+
+/**
+ * Check the content blob for an <img>
+ * If no HTML tag is found, check the first line of the post for a URL
+ *
+ * @param string $content A string which might contain image data.
+ * @param boolean $remove Whether to remove the found data from the passed content.
+ * @return string The found data
+ */
+function get_content_image( &$content, $remove = false ) {
+       $matches = $match = $src = '';
+
+       if ( preg_match( '/' . get_shortcode_regex() . '/s', $content, $match ) && 'gallery' == $match[2] ) {
+               $count = 1;
+               if ( $remove )
+                       $content = str_replace( $match[0], '', $content, $count );
+
+               $gallery = do_shortcode_tag( $match );
+               preg_match( '#src=[\'"](.+?)[\'"]#is', $gallery, $src );
+               if ( ! empty( $src[1] ) )
+                       return $src[1];
+       }
+
+       if ( preg_match( '#' . get_tag_regex( 'img' ) . '#i', $content, $matches ) ) {
+               $count = 1;
+               if ( $remove )
+                       $content = str_replace( $matches[0], '', $content, $count );
+
+               preg_match( '#src=[\'"](.+?)[\'"]#is', $matches[1], $src );
+               if ( ! empty( $src[1] ) )
+                       return $src[1];
+       }
+
+       $lines = explode( "\n", trim( $content ) );
+       $line = trim( array_shift( $lines  ) );
+
+       if ( 0 === stripos( $line, 'http' ) ) {
+               if ( $remove )
+                       $content = join( "\n", $lines );
+
+               return $line;
+       }
+}
+
+/**
+ * Return the found image data for the passed post
+ *
+ * @since 3.6.0
+ *
+ * @param int $id Optional. Post ID
+ */
+function get_the_image( $id = 0 ) {
+       $post = empty( $id ) ? get_post() : get_post( $id );
+       if ( empty( $post ) )
+               return '';
+
+       $data = get_content_image( $post->post_content );
+       if ( ! empty( $data ) )
+               return $data;
+
+       $images = get_post_images( $post->ID );
+       if ( empty( $images ) )
+               return '';
+
+       $image = reset( $images );
+       return wp_get_attachment_url( $image->ID );
+}
+
+/**
+ * Output the found image data for the current post
+ *
+ * @since 3.6.0
+ */
+function the_image() {
+       echo apply_filters( 'the_image', get_the_image() );
+}
\ No newline at end of file
diff --git wp-includes/post-formats.php wp-includes/post-formats.php
index 6d32aea..f971627 100644
--- wp-includes/post-formats.php
+++ wp-includes/post-formats.php
@@ -364,6 +364,26 @@ function post_formats_compat( $content, $id = 0 ) {
                                                );
                                        }
                                }
+                       } else {
+                               $data = get_content_image( $content, true );
+                               $img_class = empty( $compat['image_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['image_class'] ) );
+                               if ( ! empty( $data ) && 0 === stripos( $data, 'http' ) ) {
+                                       if ( empty( $meta['url'] ) ) {
+                                               $sformat = '<img %ssrc="%s"/>';
+                                               $format_output .= sprintf( $sformat, $img_class, esc_url( $data ) );
+                                       } else {
+                                               $sformat = '<a href="%s"><img %ssrc="%s"/></a>';
+                                               $format_output .= sprintf( $sformat, esc_url( $meta['url'] ), $img_class, esc_url( $data ) );
+                                       }
+                               } else {
+                                       $images = get_post_images( $post->ID );
+                                       if ( ! empty( $images ) ) {
+                                               $image = reset( $images );
+                                               $url = wp_get_attachment_url( $image->ID );
+                                               $sformat = '<img %ssrc="%s"/>';
+                                               $format_output .= sprintf( $sformat, $img_class, esc_url( $url ) );
+                                       }
+                               }
                        }
                        break;