Ticket #24126: 24126.2.diff

wp-content/themes/twentythirteen/content-gallery.php

@@ -24 +24 @@
                         <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
                         <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
                 <?php else : ?>
-                        <?php the_content(); ?>
+                        <?php the_post_format_gallery(); ?>
                 <?php endif; // is_single() ?>
         </div><!-- .entry-content -->
 

wp-includes/media.php

@@ -2278 +2278 @@
  * @since 3.6.0
  *
  * @param string $content A string which might contain image data.
+ * @param boolean $html Whether to return HTML or data
  * @param boolean $remove Optional. Whether to remove the found data from the passed content.
  * @param int $limit Optional. The number of galleries to return
  * @return array A list of galleries, which in turn are a list of their srcs in order
  */
-function get_content_galleries( &$content, $remove = false, $limit = 0 ) {
+function get_content_galleries( &$content, $html = true, $remove = false, $limit = 0 ) {
         $src = '';
         $galleries = array();
         $matches = array();
@@ -2297 +2298 @@
 
                                 $data = shortcode_parse_atts( $shortcode[3] );
                                 $gallery = do_shortcode_tag( $shortcode );
-                                preg_match_all( '#src=[\'"](.+?)[\'"]#is', $gallery, $src, PREG_SET_ORDER );
-                                if ( ! empty( $src ) ) {
-                                        foreach ( $src as $s )
-                                                $srcs[] = $s[1];
+                                if ( $html ) {
+                                        $galleries[] = $gallery;
+                                } else {
+                                        preg_match_all( '#src=[\'"](.+?)[\'"]#is', $gallery, $src, PREG_SET_ORDER );
+                                        if ( ! empty( $src ) ) {
+                                                foreach ( $src as $s )
+                                                        $srcs[] = $s[1];
+                                        }
+
+                                        $data['src'] = array_values( array_unique( $srcs ) );
+                                        $galleries[] = $data;
                                 }
 
-                                $data['src'] = array_values( array_unique( $srcs ) );
-                                $galleries[] = $data;
                                 if ( $limit > 0 && count( $galleries ) >= $limit )
                                         break;
                         }
@@ -2320 +2326 @@
  * @since 3.6.0
  *
  * @param int $post_id Optional. Post ID.
+ * @param boolean $html Whether to return HTML or data
  * @return array A list of arrays, each containing gallery data and srcs parsed
  *              from the expanded shortcode
  */
-function get_post_galleries( $post_id = 0 ) {
+function get_post_galleries( $post_id = 0, $html = true ) {
         $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
         if ( empty( $post ) || ! has_shortcode( $post->post_content, 'gallery' )  )
                 return array();
 
-        return get_content_galleries( $post->post_content );
+        return get_content_galleries( $post->post_content, $html );
 }
 
 /**
@@ -2345 +2352 @@
         if ( empty( $post ) || ! has_shortcode( $post->post_content, 'gallery' )  )
                 return array();
 
-        $data = get_content_galleries( $post->post_content );
+        $data = get_content_galleries( $post->post_content, false );
         return wp_list_pluck( $data, 'src' );
 }
 
@@ -2355 +2362 @@
  * @since 3.6.0
  *
  * @param int $post_id Optional. Post ID.
+ * @param boolean $html Whether to return HTML or data
  * @return array Gallery data and srcs parsed from the expanded shortcode
  */
-function get_post_gallery( $post_id = 0 ) {
+function get_post_gallery( $post_id = 0, $html = true ) {
         $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
         if ( empty( $post ) || ! has_shortcode( $post->post_content, 'gallery' ) )
                 return array();
 
-        $data = get_content_galleries( $post->post_content, false, 1 );
+        $data = get_content_galleries( $post->post_content, $html, false, 1 );
         return reset( $data );
 }
 
 /**
+ * Output the first gallery in the current (@global) $post
+ *
+ * @since 3.6.0
+ */
+function the_post_format_gallery() {
+        echo get_post_gallery();
+}
+
+/**
  * Check a post's content for galleries and return the image srcs for the first found gallery
  *
  * @since 3.6.0
@@ -2375 +2392 @@
  * @return array A list of a gallery's image srcs in order
  */
 function get_post_gallery_images( $post_id = 0 ) {
-        $gallery = get_post_gallery( $post_id );
+        $gallery = get_post_gallery( $post_id, false );
         if ( empty( $gallery['src'] ) )
                 return array();