Changeset 24029

Timestamp:

04/18/2013 05:08:55 PM (13 years ago)

Author:

nacin

Message:

Twenty Thirteen: Use the_post_format_gallery(). props obenland, fixes #24126.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• content-gallery.php (modified) (1 diff)
• functions.php (modified) (2 diffs)

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

@@ -25 +25 @@
             <?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 twentythirteen_featured_gallery(); ?>
+            <?php the_post_format_gallery(); ?>
         <?php endif; // is_single() ?>
     </div><!-- .entry-content -->

trunk/wp-content/themes/twentythirteen/functions.php

@@ -446 +446 @@
 }
 
-if ( ! function_exists( 'twentythirteen_featured_gallery' ) ) :
-/**
- * Displays first gallery from post content. Changes image size from thumbnail
- * to large, to display a larger first image.
- *
- * @since Twenty Thirteen 1.0
- *
- * @return void
- */
-function twentythirteen_featured_gallery() {
-    $pattern = get_shortcode_regex();
-
-    if ( preg_match( "/$pattern/s", get_the_content(), $match ) && 'gallery' == $match[2] ) {
-        add_filter( 'shortcode_atts_gallery', 'twentythirteen_gallery_atts' );
-        echo do_shortcode_tag( $match );
-    }
-}
-endif;
-
 /**
  * Sets the image size in featured galleries to large.
- *
- * @see twentythirteen_featured_gallery()
  *
  * @since Twenty Thirteen 1.0
@@ -476 +455 @@
  */
 function twentythirteen_gallery_atts( $atts ) {
-    $atts['size'] = 'large';
+    if ( has_post_format( 'gallery' ) && ! is_single() )
+        $atts['size'] = 'large';
+
     return $atts;
 }
+add_filter( 'shortcode_atts_gallery', 'twentythirteen_gallery_atts' );
 
 /**