Changeset 23826

Timestamp:

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

Author:

lancewillett

Message:

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

Location:

trunk/wp-content/themes/twentyten

Files:

• functions.php (modified) (1 diff)
• loop.php (modified) (2 diffs)

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

@@ -515 +515 @@
 }
 endif;
+
+/**
+ * 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 Ten 1.6.
+ *
+ * @return array List of image IDs from the post gallery.
+ */
+function twentyten_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;
+}

trunk/wp-content/themes/twentyten/loop.php

@@ -71 +71 @@
 <?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 ) );
+                    $images = twentyten_get_gallery_images();
                     if ( $images ) :
                         $total_images = count( $images );
                         $image = array_shift( $images );
-                        $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
                 ?>
                         <div class="gallery-thumb">
-                            <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
+                            <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
                         </div><!-- .gallery-thumb -->
                         <p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
@@ -84 +83 @@
                                 number_format_i18n( $total_images )
                             ); ?></em></p>
-                <?php endif; ?>
+                <?php endif; // end twentyten_get_gallery_images() check ?>
                         <?php the_excerpt(); ?>
 <?php endif; ?>