From 13b56f88807d533b18151b9d38cc7bf11ee6281e Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 21 Nov 2011 16:20:49 +0000
Subject: [PATCH] TwentyEleven: Always call the loop properly in all template
 files rather than just calling the_post(). Fixes #18794 props mfields.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/image.php      | 94 ++++++++++---------
 wp-content/themes/twentyeleven/page.php       |  8 +-
 wp-content/themes/twentyeleven/showcase.php   |  4 +-
 .../themes/twentyeleven/sidebar-page.php      |  8 +-
 4 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/wp-content/themes/twentyeleven/image.php b/wp-content/themes/twentyeleven/image.php
index c6c8544b12..e772038789 100644
--- a/wp-content/themes/twentyeleven/image.php
+++ b/wp-content/themes/twentyeleven/image.php
@@ -12,40 +12,40 @@ get_header(); ?>
 		<div id="primary" class="image-attachment">
 			<div id="content" role="main">
 
-			<?php the_post(); ?>
+			<?php while ( have_posts() ) : the_post(); ?>
 
-			<nav id="nav-single">
-				<h3 class="assistive-text"><?php _e( 'Image navigation', 'twentyeleven' ); ?></h3>
-				<span class="nav-previous"><?php previous_image_link( false, __( '&larr; Previous' , 'twentyeleven' ) ); ?></span>
-				<span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span>
-			</nav><!-- #nav-single -->
+				<nav id="nav-single">
+					<h3 class="assistive-text"><?php _e( 'Image navigation', 'twentyeleven' ); ?></h3>
+					<span class="nav-previous"><?php previous_image_link( false, __( '&larr; Previous' , 'twentyeleven' ) ); ?></span>
+					<span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span>
+				</nav><!-- #nav-single -->
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-					<header class="entry-header">
-						<h1 class="entry-title"><?php the_title(); ?></h1>
+					<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+						<header class="entry-header">
+							<h1 class="entry-title"><?php the_title(); ?></h1>
 
-						<div class="entry-meta">
-							<?php
-								$metadata = wp_get_attachment_metadata();
-								printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%7$s</a>', 'twentyeleven' ),
-									esc_attr( get_the_time() ),
-									get_the_date(),
-									esc_url( wp_get_attachment_url() ),
-									$metadata['width'],
-									$metadata['height'],
-									esc_url( get_permalink( $post->post_parent ) ),
-									get_the_title( $post->post_parent )
-								);
-							?>
-							<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
-						</div><!-- .entry-meta -->
+							<div class="entry-meta">
+								<?php
+									$metadata = wp_get_attachment_metadata();
+									printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%7$s</a>', 'twentyeleven' ),
+										esc_attr( get_the_time() ),
+										get_the_date(),
+										esc_url( wp_get_attachment_url() ),
+										$metadata['width'],
+										$metadata['height'],
+										esc_url( get_permalink( $post->post_parent ) ),
+										get_the_title( $post->post_parent )
+									);
+								?>
+								<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+							</div><!-- .entry-meta -->
 
-					</header><!-- .entry-header -->
+						</header><!-- .entry-header -->
 
-					<div class="entry-content">
+						<div class="entry-content">
 
-						<div class="entry-attachment">
-							<div class="attachment">
+							<div class="entry-attachment">
+								<div class="attachment">
 <?php
 	/**
 	 * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
@@ -70,30 +70,32 @@ get_header(); ?>
 		$next_attachment_url = wp_get_attachment_url();
 	}
 ?>
-								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-								$attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
-								echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
-								?></a>
+									<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+									$attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
+									echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
+									?></a>
 
-								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
-								<div class="entry-caption">
-									<?php the_excerpt(); ?>
-								</div>
-								<?php endif; ?>
-							</div><!-- .attachment -->
+									<?php if ( ! empty( $post->post_excerpt ) ) : ?>
+									<div class="entry-caption">
+										<?php the_excerpt(); ?>
+									</div>
+									<?php endif; ?>
+								</div><!-- .attachment -->
 
-						</div><!-- .entry-attachment -->
+							</div><!-- .entry-attachment -->
 
-						<div class="entry-description">
-							<?php the_content(); ?>
-							<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
-						</div><!-- .entry-description -->
+							<div class="entry-description">
+								<?php the_content(); ?>
+								<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+							</div><!-- .entry-description -->
 
-					</div><!-- .entry-content -->
+						</div><!-- .entry-content -->
 
-				</article><!-- #post-<?php the_ID(); ?> -->
+					</article><!-- #post-<?php the_ID(); ?> -->
 
-				<?php comments_template(); ?>
+					<?php comments_template(); ?>
+
+				<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
 		</div><!-- #primary -->
diff --git a/wp-content/themes/twentyeleven/page.php b/wp-content/themes/twentyeleven/page.php
index 3b96e52c9c..5dda4d164f 100644
--- a/wp-content/themes/twentyeleven/page.php
+++ b/wp-content/themes/twentyeleven/page.php
@@ -17,11 +17,13 @@ get_header(); ?>
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php the_post(); ?>
+				<?php while ( have_posts() ) : the_post(); ?>
 
-				<?php get_template_part( 'content', 'page' ); ?>
+					<?php get_template_part( 'content', 'page' ); ?>
 
-				<?php comments_template( '', true ); ?>
+					<?php comments_template( '', true ); ?>
+
+				<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
 		</div><!-- #primary -->
diff --git a/wp-content/themes/twentyeleven/showcase.php b/wp-content/themes/twentyeleven/showcase.php
index 58e85e21f2..4f69099240 100644
--- a/wp-content/themes/twentyeleven/showcase.php
+++ b/wp-content/themes/twentyeleven/showcase.php
@@ -22,7 +22,7 @@ get_header(); ?>
 		<div id="primary" class="showcase">
 			<div id="content" role="main">
 
-				<?php the_post(); ?>
+				<?php while ( have_posts() ) : the_post(); ?>
 
 				<?php
 					/**
@@ -33,6 +33,8 @@ get_header(); ?>
 						get_template_part( 'content', 'intro' );
 				?>
 
+				<?php endwhile; ?>
+
 				<?php
 					/**
 					 * Begin the featured posts section.
diff --git a/wp-content/themes/twentyeleven/sidebar-page.php b/wp-content/themes/twentyeleven/sidebar-page.php
index d47e4eea31..c10d628586 100644
--- a/wp-content/themes/twentyeleven/sidebar-page.php
+++ b/wp-content/themes/twentyeleven/sidebar-page.php
@@ -13,11 +13,13 @@ get_header(); ?>
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php the_post(); ?>
+				<?php while ( have_posts() ) : the_post(); ?>
 
-				<?php get_template_part( 'content', 'page' ); ?>
+					<?php get_template_part( 'content', 'page' ); ?>
 
-				<?php comments_template( '', true ); ?>
+					<?php comments_template( '', true ); ?>
+
+				<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
 		</div><!-- #primary -->