<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19379] trunk/wp-content/themes/twentyeleven: TwentyEleven: Always call the loop properly in all template files rather than just calling the_post().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19379">19379</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-11-21 16:20:49 +0000 (Mon, 21 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>TwentyEleven: Always call the loop properly in all template files rather than just calling the_post(). Fixes <a href="http://core.trac.wordpress.org/ticket/18794">#18794</a> props mfields.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenimagephp">trunk/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenpagephp">trunk/wp-content/themes/twentyeleven/page.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenshowcasephp">trunk/wp-content/themes/twentyeleven/showcase.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevensidebarpagephp">trunk/wp-content/themes/twentyeleven/sidebar-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/image.php (19378 => 19379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/image.php 2011-11-21 15:47:49 UTC (rev 19378)
+++ trunk/wp-content/themes/twentyeleven/image.php 2011-11-21 16:20:49 UTC (rev 19379)
</span><span class="lines">@@ -12,40 +12,40 @@
</span><span class="cx"> <div id="primary" class="image-attachment">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php the_post(); ?>
</del><ins>+ <?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><del>- <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 -->
</del><ins>+ <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 -->
</ins><span class="cx">
</span><del>- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <header class="entry-header">
- <h1 class="entry-title"><?php the_title(); ?></h1>
</del><ins>+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><?php the_title(); ?></h1>
</ins><span class="cx">
</span><del>- <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 -->
</del><ins>+ <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 -->
</ins><span class="cx">
</span><del>- </header><!-- .entry-header -->
</del><ins>+ </header><!-- .entry-header -->
</ins><span class="cx">
</span><del>- <div class="entry-content">
</del><ins>+ <div class="entry-content">
</ins><span class="cx">
</span><del>- <div class="entry-attachment">
- <div class="attachment">
</del><ins>+ <div class="entry-attachment">
+ <div class="attachment">
</ins><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * 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,
</span><span class="lines">@@ -70,31 +70,33 @@
</span><span class="cx"> $next_attachment_url = wp_get_attachment_url();
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><del>- <?php if ( ! empty( $post->post_excerpt ) ) : ?>
- <div class="entry-caption">
- <?php the_excerpt(); ?>
- </div>
- <?php endif; ?>
- </div><!-- .attachment -->
</del><ins>+ <?php if ( ! empty( $post->post_excerpt ) ) : ?>
+ <div class="entry-caption">
+ <?php the_excerpt(); ?>
+ </div>
+ <?php endif; ?>
+ </div><!-- .attachment -->
</ins><span class="cx">
</span><del>- </div><!-- .entry-attachment -->
</del><ins>+ </div><!-- .entry-attachment -->
</ins><span class="cx">
</span><del>- <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 -->
</del><ins>+ <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 -->
</ins><span class="cx">
</span><del>- </div><!-- .entry-content -->
</del><ins>+ </div><!-- .entry-content -->
</ins><span class="cx">
</span><del>- </article><!-- #post-<?php the_ID(); ?> -->
</del><ins>+ </article><!-- #post-<?php the_ID(); ?> -->
</ins><span class="cx">
</span><del>- <?php comments_template(); ?>
</del><ins>+ <?php comments_template(); ?>
</ins><span class="cx">
</span><ins>+ <?php endwhile; // end of the loop. ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/page.php (19378 => 19379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/page.php 2011-11-21 15:47:49 UTC (rev 19378)
+++ trunk/wp-content/themes/twentyeleven/page.php 2011-11-21 16:20:49 UTC (rev 19379)
</span><span class="lines">@@ -17,12 +17,14 @@
</span><span class="cx"> <div id="primary">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php the_post(); ?>
</del><ins>+ <?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><del>- <?php get_template_part( 'content', 'page' ); ?>
</del><ins>+ <?php get_template_part( 'content', 'page' ); ?>
</ins><span class="cx">
</span><del>- <?php comments_template( '', true ); ?>
</del><ins>+ <?php comments_template( '', true ); ?>
</ins><span class="cx">
</span><ins>+ <?php endwhile; // end of the loop. ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenshowcasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/showcase.php (19378 => 19379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/showcase.php 2011-11-21 15:47:49 UTC (rev 19378)
+++ trunk/wp-content/themes/twentyeleven/showcase.php 2011-11-21 16:20:49 UTC (rev 19379)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> <div id="primary" class="showcase">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php the_post(); ?>
</del><ins>+ <?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> get_template_part( 'content', 'intro' );
</span><span class="cx"> ?>
</span><span class="cx">
</span><ins>+ <?php endwhile; ?>
+
</ins><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Begin the featured posts section.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensidebarpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/sidebar-page.php (19378 => 19379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/sidebar-page.php 2011-11-21 15:47:49 UTC (rev 19378)
+++ trunk/wp-content/themes/twentyeleven/sidebar-page.php 2011-11-21 16:20:49 UTC (rev 19379)
</span><span class="lines">@@ -13,12 +13,14 @@
</span><span class="cx"> <div id="primary">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php the_post(); ?>
</del><ins>+ <?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><del>- <?php get_template_part( 'content', 'page' ); ?>
</del><ins>+ <?php get_template_part( 'content', 'page' ); ?>
</ins><span class="cx">
</span><del>- <?php comments_template( '', true ); ?>
</del><ins>+ <?php comments_template( '', true ); ?>
</ins><span class="cx">
</span><ins>+ <?php endwhile; // end of the loop. ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>