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
This commit is contained in:
westi 2011-11-21 16:20:49 +00:00
parent edef2fb572
commit 13b56f8880
4 changed files with 61 additions and 53 deletions

View File

@ -12,40 +12,40 @@ get_header(); ?>
<div id="primary" class="image-attachment"> <div id="primary" class="image-attachment">
<div id="content" role="main"> <div id="content" role="main">
<?php the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
<nav id="nav-single"> <nav id="nav-single">
<h3 class="assistive-text"><?php _e( 'Image navigation', 'twentyeleven' ); ?></h3> <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-previous"><?php previous_image_link( false, __( '&larr; Previous' , 'twentyeleven' ) ); ?></span>
<span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span> <span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span>
</nav><!-- #nav-single --> </nav><!-- #nav-single -->
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-meta"> <div class="entry-meta">
<?php <?php
$metadata = wp_get_attachment_metadata(); $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' ), 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() ), esc_attr( get_the_time() ),
get_the_date(), get_the_date(),
esc_url( wp_get_attachment_url() ), esc_url( wp_get_attachment_url() ),
$metadata['width'], $metadata['width'],
$metadata['height'], $metadata['height'],
esc_url( get_permalink( $post->post_parent ) ), esc_url( get_permalink( $post->post_parent ) ),
get_the_title( $post->post_parent ) get_the_title( $post->post_parent )
); );
?> ?>
<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
</header><!-- .entry-header --> </header><!-- .entry-header -->
<div class="entry-content"> <div class="entry-content">
<div class="entry-attachment"> <div class="entry-attachment">
<div class="attachment"> <div class="attachment">
<?php <?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, * 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(); $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 <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 ); $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. echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
?></a> ?></a>
<?php if ( ! empty( $post->post_excerpt ) ) : ?> <?php if ( ! empty( $post->post_excerpt ) ) : ?>
<div class="entry-caption"> <div class="entry-caption">
<?php the_excerpt(); ?> <?php the_excerpt(); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
</div><!-- .attachment --> </div><!-- .attachment -->
</div><!-- .entry-attachment --> </div><!-- .entry-attachment -->
<div class="entry-description"> <div class="entry-description">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?> <?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
</div><!-- .entry-description --> </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><!-- #content -->
</div><!-- #primary --> </div><!-- #primary -->

View File

@ -17,11 +17,13 @@ get_header(); ?>
<div id="primary"> <div id="primary">
<div id="content" role="main"> <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><!-- #content -->
</div><!-- #primary --> </div><!-- #primary -->

View File

@ -22,7 +22,7 @@ get_header(); ?>
<div id="primary" class="showcase"> <div id="primary" class="showcase">
<div id="content" role="main"> <div id="content" role="main">
<?php the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
<?php <?php
/** /**
@ -33,6 +33,8 @@ get_header(); ?>
get_template_part( 'content', 'intro' ); get_template_part( 'content', 'intro' );
?> ?>
<?php endwhile; ?>
<?php <?php
/** /**
* Begin the featured posts section. * Begin the featured posts section.

View File

@ -13,11 +13,13 @@ get_header(); ?>
<div id="primary"> <div id="primary">
<div id="content" role="main"> <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><!-- #content -->
</div><!-- #primary --> </div><!-- #primary -->