Changeset 24537

Timestamp:

07/01/2013 05:27:41 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: cleanup for functions.php file, props obenland. See #24653.

File:

• trunk/wp-content/themes/twentythirteen/functions.php (modified) (7 diffs)

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

@@ -35 +35 @@
  * Adds support for a custom header image.
  */
-require( get_template_directory() . '/inc/custom-header.php' );
+require get_template_directory() . '/inc/custom-header.php';
 
 /**
@@ -41 +41 @@
  */
 if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) )
-    require( get_template_directory() . '/inc/back-compat.php' );
+    require get_template_directory() . '/inc/back-compat.php';
 
 /**
@@ -275 +275 @@
         'name'          => __( 'Main Widget Area', 'twentythirteen' ),
         'id'            => 'sidebar-1',
-        'description'   => __( 'Appears in the footer section of the site', 'twentythirteen' ),
+        'description'   => __( 'Appears in the footer section of the site.', 'twentythirteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget'  => '</aside>',
@@ -306 +306 @@
 
     // Don't print empty markup if there's only one page.
-    if ( $wp_query->max_num_pages < 2 && ( is_home() || is_archive() || is_search() ) )
+    if ( $wp_query->max_num_pages < 2 )
         return;
     ?>
@@ -340 +340 @@
     // Don't print empty markup if there's nowhere to navigate.
     $previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
-    $next = get_adjacent_post( false, '', false );
+    $next     = get_adjacent_post( false, '', false );
 
     if ( ! $next && ! $previous )
@@ -445 +445 @@
      * link to that image file.
      */
-    $attachments = array_values( get_children( array(
+    $attachment_ids = get_posts( array(
         'post_parent'    => $post->post_parent,
+        'fields'         => 'ids',
+        'numberposts'    => -1,
         'post_status'    => 'inherit',
         'post_type'      => 'attachment',
@@ -452 +454 @@
         'order'          => 'ASC',
         'orderby'        => 'menu_order ID'
-    ) ) );
+    ) );
 
     // If there is more than 1 attachment in a gallery...
-    if ( count( $attachments ) > 1 ) {
-        foreach ( $attachments as $k => $attachment ) {
-            if ( $attachment->ID == $post->ID )
+    if ( count( $attachment_ids ) > 1 ) {
+        foreach ( $attachment_ids as $attachment_id ) {
+            if ( $attachment_id == $post->ID ) {
+                $next_id = current( $attachment_ids );
                 break;
+            }
         }
-        $k++;
 
         // get the URL of the next image attachment...
-        if ( isset( $attachments[ $k ] ) )
-            $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+        if ( $next_id )
+            $next_attachment_url = get_attachment_link( $next_id );
 
         // or get the URL of the first image attachment.
         else
-            $next_attachment_url = get_attachment_link( $attachments[0]->ID );
+            $next_attachment_url = get_attachment_link( array_shift( $attachment_ids ) );
     }