<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15787] branches/3.0/wp-content/themes/twentyten: Use get_template_part()
for single.php, attachment.php, page.php,
and our page template in Twenty Ten.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15787">15787</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-13 05:05:25 +0000 (Wed, 13 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use get_template_part() for single.php, attachment.php, page.php, and our page template in Twenty Ten. Introduces loop-page/single/attachment.php. props koopersmith, fixes <a href="http://trac.wordpress.org/ticket/15078">#15078</a> for 3.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenonecolumnpagephp">branches/3.0/wp-content/themes/twentyten/onecolumn-page.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenattachmentphp">branches/3.0/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenloopattachmentphp">branches/3.0/wp-content/themes/twentyten/loop-attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenlooppagephp">branches/3.0/wp-content/themes/twentyten/loop-page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenloopsinglephp">branches/3.0/wp-content/themes/twentyten/loop-single.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenpagephp">branches/3.0/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytensinglephp">branches/3.0/wp-content/themes/twentyten/single.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenattachmentphp">branches/3.0/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenpagephp">branches/3.0/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytensinglephp">branches/3.0/wp-content/themes/twentyten/single.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/attachment.php (15786 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/attachment.php 2010-10-13 05:00:10 UTC (rev 15786)
+++ branches/3.0/wp-content/themes/twentyten/attachment.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -1,118 +0,0 @@
</span><del>-<?php
-/**
- * The template for displaying attachments.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.0
- */
-
-get_header(); ?>
-
- <div id="container" class="single-attachment">
- <div id="content" role="main">
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
- <?php if ( ! empty( $post->post_parent ) ) : ?>
- <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
- /* translators: %s - title of parent post */
- printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
- ?></a></p>
- <?php endif; ?>
-
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h2 class="entry-title"><?php the_title(); ?></h2>
-
- <div class="entry-meta">
- <?php
- printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
- 'meta-prep meta-prep-author',
- sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
- get_author_posts_url( get_the_author_meta( 'ID' ) ),
- sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
- get_the_author()
- )
- );
- ?>
- <span class="meta-sep">|</span>
- <?php
- printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
- 'meta-prep meta-prep-entry-date',
- sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
- esc_attr( get_the_time() ),
- get_the_date()
- )
- );
- if ( wp_attachment_is_image() ) {
- echo ' <span class="meta-sep">|</span> ';
- $metadata = wp_get_attachment_metadata();
- printf( __( 'Full size is %s pixels', 'twentyten'),
- sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
- wp_get_attachment_url(),
- esc_attr( __('Link to full-size image', 'twentyten') ),
- $metadata['width'],
- $metadata['height']
- )
- );
- }
- ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-meta -->
-
- <div class="entry-content">
- <div class="entry-attachment">
-<?php if ( wp_attachment_is_image() ) :
- $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
- foreach ( $attachments as $k => $attachment ) {
- if ( $attachment->ID == $post->ID )
- break;
- }
- $k++;
- // If there is more than 1 image attachment in a gallery
- if ( count( $attachments ) > 1 ) {
- if ( isset( $attachments[ $k ] ) )
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- else
- // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
- } else {
- // or, if there's only 1 image attachment, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
- }
-?>
- <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
- $attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
- echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
- ?></a></p>
-
- <div id="nav-below" class="navigation">
- <div class="nav-previous"><?php previous_image_link( false ); ?></div>
- <div class="nav-next"><?php next_image_link( false ); ?></div>
- </div><!-- #nav-below -->
-<?php else : ?>
- <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
-<?php endif; ?>
- </div><!-- .entry-attachment -->
- <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
-
-<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-
- </div><!-- .entry-content -->
-
- <div class="entry-utility">
- <?php twentyten_posted_in(); ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-utility -->
- </div><!-- #post-## -->
-
-<?php comments_template(); ?>
-
-<?php endwhile; ?>
-
- </div><!-- #content -->
- </div><!-- #container -->
-
-<?php get_footer(); ?>
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="addfile"><h4>Added: branches/3.0/wp-content/themes/twentyten/attachment.php (0 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/attachment.php (rev 0)
+++ branches/3.0/wp-content/themes/twentyten/attachment.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<?php
+/**
+ * The template for displaying attachments.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+
+get_header(); ?>
+
+ <div id="container" class="single-attachment">
+ <div id="content" role="main">
+
+ <?php
+ /* Run the loop to output the attachment.
+ * If you want to overload this in a child theme then include a file
+ * called loop-attachment.php and that will be used instead.
+ */
+ get_template_part( 'loop', 'attachment' );
+ ?>
+
+ </div><!-- #content -->
+ </div><!-- #container -->
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopattachmentphpfromrev15782branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="copfile"><h4>Copied: branches/3.0/wp-content/themes/twentyten/loop-attachment.php (from rev 15782, branches/3.0/wp-content/themes/twentyten/attachment.php) (0 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-attachment.php (rev 0)
+++ branches/3.0/wp-content/themes/twentyten/loop-attachment.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -0,0 +1,116 @@
</span><ins>+<?php
+/**
+ * The loop that displays an attachment.
+ *
+ * The loop displays the posts and the post content. See
+ * http://codex.wordpress.org/The_Loop to understand it and
+ * http://codex.wordpress.org/Template_Tags to understand
+ * the tags used in it.
+ *
+ * This can be overridden in child themes with loop-attachment.php.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.2
+ */
+?>
+
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+ <?php if ( ! empty( $post->post_parent ) ) : ?>
+ <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
+ /* translators: %s - title of parent post */
+ printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
+ ?></a></p>
+ <?php endif; ?>
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h2 class="entry-title"><?php the_title(); ?></h2>
+
+ <div class="entry-meta">
+ <?php
+ printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
+ 'meta-prep meta-prep-author',
+ sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ )
+ );
+ ?>
+ <span class="meta-sep">|</span>
+ <?php
+ printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
+ 'meta-prep meta-prep-entry-date',
+ sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
+ esc_attr( get_the_time() ),
+ get_the_date()
+ )
+ );
+ if ( wp_attachment_is_image() ) {
+ echo ' <span class="meta-sep">|</span> ';
+ $metadata = wp_get_attachment_metadata();
+ printf( __( 'Full size is %s pixels', 'twentyten'),
+ sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+ wp_get_attachment_url(),
+ esc_attr( __('Link to full-size image', 'twentyten') ),
+ $metadata['width'],
+ $metadata['height']
+ )
+ );
+ }
+ ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-meta -->
+
+ <div class="entry-content">
+ <div class="entry-attachment">
+<?php if ( wp_attachment_is_image() ) :
+ $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID )
+ break;
+ }
+ $k++;
+ // If there is more than 1 image attachment in a gallery
+ if ( count( $attachments ) > 1 ) {
+ if ( isset( $attachments[ $k ] ) )
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ else
+ // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+ } else {
+ // or, if there's only 1 image attachment, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
+ }
+?>
+ <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+ $attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
+ echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
+ ?></a></p>
+
+ <div id="nav-below" class="navigation">
+ <div class="nav-previous"><?php previous_image_link( false ); ?></div>
+ <div class="nav-next"><?php next_image_link( false ); ?></div>
+ </div><!-- #nav-below -->
+<?php else : ?>
+ <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
+<?php endif; ?>
+ </div><!-- .entry-attachment -->
+ <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+
+ </div><!-- .entry-content -->
+
+ <div class="entry-utility">
+ <?php twentyten_posted_in(); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
+
+<?php comments_template(); ?>
+
+<?php endwhile; // end of the loop. ?>
</ins></span></pre></div>
<a id="branches30wpcontentthemestwentytenlooppagephpfromrev15782branches30wpcontentthemestwentytenpagephp"></a>
<div class="copfile"><h4>Copied: branches/3.0/wp-content/themes/twentyten/loop-page.php (from rev 15782, branches/3.0/wp-content/themes/twentyten/page.php) (0 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-page.php (rev 0)
+++ branches/3.0/wp-content/themes/twentyten/loop-page.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<?php
+/**
+ * The loop that displays a page.
+ *
+ * The loop displays the posts and the post content. See
+ * http://codex.wordpress.org/The_Loop to understand it and
+ * http://codex.wordpress.org/Template_Tags to understand
+ * the tags used in it.
+ *
+ * This can be overridden in child themes with loop-page.php.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.2
+ */
+?>
+
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <?php if ( is_front_page() ) { ?>
+ <h2 class="entry-title"><?php the_title(); ?></h2>
+ <?php } else { ?>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+ <?php } ?>
+
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-content -->
+ </div><!-- #post-## -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; // end of the loop. ?>
</ins></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopsinglephpfromrev15782branches30wpcontentthemestwentytensinglephp"></a>
<div class="copfile"><h4>Copied: branches/3.0/wp-content/themes/twentyten/loop-single.php (from rev 15782, branches/3.0/wp-content/themes/twentyten/single.php) (0 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-single.php (rev 0)
+++ branches/3.0/wp-content/themes/twentyten/loop-single.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<?php
+/**
+ * The loop that displays a single post.
+ *
+ * The loop displays the posts and the post content. See
+ * http://codex.wordpress.org/The_Loop to understand it and
+ * http://codex.wordpress.org/Template_Tags to understand
+ * the tags used in it.
+ *
+ * This can be overridden in child themes with loop-single.php.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.2
+ */
+?>
+
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+ <div id="nav-above" class="navigation">
+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
+ </div><!-- #nav-above -->
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+
+ <div class="entry-meta">
+ <?php twentyten_posted_on(); ?>
+ </div><!-- .entry-meta -->
+
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
+
+<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
+ <div id="entry-author-info">
+ <div id="author-avatar">
+ <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
+ </div><!-- #author-avatar -->
+ <div id="author-description">
+ <h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
+ <?php the_author_meta( 'description' ); ?>
+ <div id="author-link">
+ <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
+ <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyten' ), get_the_author() ); ?>
+ </a>
+ </div><!-- #author-link -->
+ </div><!-- #author-description -->
+ </div><!-- #entry-author-info -->
+<?php endif; ?>
+
+ <div class="entry-utility">
+ <?php twentyten_posted_in(); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
+
+ <div id="nav-below" class="navigation">
+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
+ </div><!-- #nav-below -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; // end of the loop. ?>
</ins></span></pre></div>
<a id="branches30wpcontentthemestwentytenonecolumnpagephp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/onecolumn-page.php (15786 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/onecolumn-page.php 2010-10-13 05:00:10 UTC (rev 15786)
+++ branches/3.0/wp-content/themes/twentyten/onecolumn-page.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -17,21 +17,14 @@
</span><span class="cx"> <div id="container" class="one-column">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</del><ins>+ <?php
+ /* Run the loop to output the page.
+ * If you want to overload this in a child theme then include a file
+ * called loop-page.php and that will be used instead.
+ */
+ get_template_part( 'loop', 'page' );
+ ?>
</ins><span class="cx">
</span><del>- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h1 class="entry-title"><?php the_title(); ?></h1>
- <div class="entry-content">
- <?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-content -->
- </div><!-- #post-## -->
-
- <?php comments_template( '', true ); ?>
-
-<?php endwhile; ?>
-
</del><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenpagephp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/page.php (15786 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/page.php 2010-10-13 05:00:10 UTC (rev 15786)
+++ branches/3.0/wp-content/themes/twentyten/page.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-<?php
-/**
- * The template for displaying all pages.
- *
- * This is the template that displays all pages by default.
- * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
- * different template.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.0
- */
-
-get_header(); ?>
-
- <div id="container">
- <div id="content" role="main">
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <?php if ( is_front_page() ) { ?>
- <h2 class="entry-title"><?php the_title(); ?></h2>
- <?php } else { ?>
- <h1 class="entry-title"><?php the_title(); ?></h1>
- <?php } ?>
-
- <div class="entry-content">
- <?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-content -->
- </div><!-- #post-## -->
-
- <?php comments_template( '', true ); ?>
-
-<?php endwhile; ?>
-
- </div><!-- #content -->
- </div><!-- #container -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenpagephp"></a>
<div class="addfile"><h4>Added: branches/3.0/wp-content/themes/twentyten/page.php (0 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/page.php (rev 0)
+++ branches/3.0/wp-content/themes/twentyten/page.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<?php
+/**
+ * The template for displaying all pages.
+ *
+ * This is the template that displays all pages by default.
+ * Please note that this is the WordPress construct of pages
+ * and that other 'pages' on your WordPress site will use a
+ * different template.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+
+get_header(); ?>
+
+ <div id="container">
+ <div id="content" role="main">
+
+ <?php
+ /* Run the loop to output the page.
+ * If you want to overload this in a child theme then include a file
+ * called loop-page.php and that will be used instead.
+ */
+ get_template_part( 'loop', 'page' );
+ ?>
+
+ </div><!-- #content -->
+ </div><!-- #container -->
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="branches30wpcontentthemestwentytensinglephp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/single.php (15786 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/single.php 2010-10-13 05:00:10 UTC (rev 15786)
+++ branches/3.0/wp-content/themes/twentyten/single.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-<?php
-/**
- * The Template for displaying all single posts.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.0
- */
-
-get_header(); ?>
-
- <div id="container">
- <div id="content" role="main">
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
- <div id="nav-above" class="navigation">
- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
- </div><!-- #nav-above -->
-
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h1 class="entry-title"><?php the_title(); ?></h1>
-
- <div class="entry-meta">
- <?php twentyten_posted_on(); ?>
- </div><!-- .entry-meta -->
-
- <div class="entry-content">
- <?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
- </div><!-- .entry-content -->
-
-<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
- <div id="entry-author-info">
- <div id="author-avatar">
- <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
- </div><!-- #author-avatar -->
- <div id="author-description">
- <h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
- <?php the_author_meta( 'description' ); ?>
- <div id="author-link">
- <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
- <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyten' ), get_the_author() ); ?>
- </a>
- </div><!-- #author-link -->
- </div><!-- #author-description -->
- </div><!-- #entry-author-info -->
-<?php endif; ?>
-
- <div class="entry-utility">
- <?php twentyten_posted_in(); ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-utility -->
- </div><!-- #post-## -->
-
- <div id="nav-below" class="navigation">
- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
- </div><!-- #nav-below -->
-
- <?php comments_template( '', true ); ?>
-
-<?php endwhile; // end of the loop. ?>
-
- </div><!-- #content -->
- </div><!-- #container -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytensinglephp"></a>
<div class="addfile"><h4>Added: branches/3.0/wp-content/themes/twentyten/single.php (0 => 15787)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/single.php (rev 0)
+++ branches/3.0/wp-content/themes/twentyten/single.php 2010-10-13 05:05:25 UTC (rev 15787)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<?php
+/**
+ * The Template for displaying all single posts.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+
+get_header(); ?>
+
+ <div id="container">
+ <div id="content" role="main">
+
+ <?php
+ /* Run the loop to output the post.
+ * If you want to overload this in a child theme then include a file
+ * called loop-single.php and that will be used instead.
+ */
+ get_template_part( 'loop', 'single' );
+ ?>
+
+ </div><!-- #content -->
+ </div><!-- #container -->
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
</ins></span></pre>
</div>
</div>
</body>
</html>