Changeset 23824

Timestamp:

03/27/2013 08:34:28 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Eleven: improve how gallery image IDs are retrieved for use in the Gallery post format template. Props to obenland for original patch, fixes #22907.

Location:

trunk/wp-content/themes/twentyeleven

Files:

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

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

@@ -31 +31 @@
             <?php if ( post_password_required() ) : ?>
                 <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-
-            <?php else : ?>
-                <?php
-                    $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
-                    if ( $images ) :
-                        $total_images = count( $images );
-                        $image = array_shift( $images );
-                        $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
-                ?>
-
+            <?php else :
+                $images = twentyeleven_get_gallery_images();
+                if ( $images ) :
+                    $total_images = count( $images );
+                    $image = array_shift( $images );
+            ?>
                 <figure class="gallery-thumb">
-                    <a href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
+                    <a href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
                 </figure><!-- .gallery-thumb -->
 
@@ -49 +45 @@
                         number_format_i18n( $total_images )
                     ); ?></em></p>
-            <?php endif; ?>
+            <?php endif; // end twentyeleven_get_gallery_images() check ?>
             <?php the_excerpt(); ?>
         <?php endif; ?>

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

@@ -627 +627 @@
 }
 add_filter( 'body_class', 'twentyeleven_body_classes' );
+
+/**
+ * Retrieves the IDs for images in a gallery.
+ *
+ * @uses get_post_galleries() first, if available. Falls back to shortcode parsing,
+ * then as last option uses a get_posts() call.
+ *
+ * @since Twenty Eleven 1.6.
+ *
+ * @return array List of image IDs from the post gallery.
+ */
+function twentyeleven_get_gallery_images() {
+    $images = array();
+
+    if ( function_exists( 'get_post_gallery_images' ) ) {
+        $galleries = get_post_galleries();
+        if ( isset( $galleries[0]['ids'] ) )
+            $images = explode( ',', $galleries[0]['ids'] );
+    } else {
+        $pattern = get_shortcode_regex();
+        preg_match( "/$pattern/s", get_the_content(), $match );
+        $atts = shortcode_parse_atts( $match[3] );
+        if ( isset( $atts['ids'] ) )
+            $images = explode( ',', $atts['ids'] );
+    }
+
+    if ( ! $images ) {
+        $images = get_posts( array(
+            'fields'         => 'ids',
+            'numberposts'    => 999,
+            'order'          => 'ASC',
+            'orderby'        => 'menu_order',
+            'post_mime_type' => 'image',
+            'post_parent'    => get_the_ID(),
+            'post_type'      => 'attachment',
+        ) );
+    }
+
+    return $images;
+}