<!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>[13141] trunk/wp-content/themes/twentyten:
Move the Loop into a separate file.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13141">13141</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-14 07:13:34 +0000 (Sun, 14 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the Loop into a separate file. Reduces code duplication and adds Gallery/Aside styling to all archive views. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenarchivephp">trunk/wp-content/themes/twentyten/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenauthorphp">trunk/wp-content/themes/twentyten/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfooterphp">trunk/wp-content/themes/twentyten/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchphp">trunk/wp-content/themes/twentyten/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentytentagphp">trunk/wp-content/themes/twentyten/tag.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/archive.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/archive.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -11,53 +11,14 @@
</span><span class="cx">                                 <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?></h1>
</span><span class="cx"> <?php elseif ( is_year() ) : ?>
</span><span class="cx">                                 <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?></h1>
</span><del>-<?php elseif ( isset($_GET['paged']) && !empty($_GET['paged']) ) : ?>
</del><ins>+<?php else : ?>
</ins><span class="cx">                                 <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ); ?></h1>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-above -->
-<?php } ?>
</del><ins>+<?php include 'loop.php'; ?>
</ins><span class="cx">
</span><del>-<?php while ( have_posts() ) : the_post(); ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                                        <div class="entry-meta">
-                                                <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
-                                                <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( get_the_time() ); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                                <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
-                                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                                        </div><!-- .entry-meta -->
-
-                                        <div class="entry-summary">
-<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                                        </div><!-- .entry-summary -->
-
-                                        <div class="entry-utility">
-                                                <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
-                                                <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-                                                <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
-                                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                                        </div><!-- #entry-utility -->
-                                </div><!-- #post-<?php the_ID(); ?> -->
-
-<?php endwhile; ?>
-
-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
-<?php } ?>
-
</del><span class="cx">                         </div><!-- #content -->
</span><span class="cx">                 </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/author.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>-                                <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='" . esc_attr($authordata->display_name) . "' rel='me'>" . esc_html($authordata->display_name) . "</a>" ); ?></h1>
</del><ins>+                                <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='" . esc_attr(get_the_author()) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
</ins><span class="cx">
</span><span class="cx"> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</span><span class="cx">                                         <div id="entry-author-info">
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">                                                         <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</span><span class="cx">                                                 </div><!-- #author-avatar         -->
</span><span class="cx">                                                 <div id="author-description">
</span><del>-                                                        <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</del><ins>+                                                        <h2><?php printf(__('About %s', 'twentyten'), get_the_author()); ?></h2>
</ins><span class="cx">                                                         <?php the_author_meta('description'); ?>
</span><span class="cx">                                                 </div><!-- #author-description        -->
</span><span class="cx">                                         </div><!-- .entry-author-info -->
</span><span class="lines">@@ -21,45 +21,8 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-above -->
-<?php } ?>
</del><ins>+<?php include 'loop.php'; ?>
</ins><span class="cx">
</span><del>-<?php while ( have_posts() ) : the_post(); ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                                        <div class="entry-meta">
-                                                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                                                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                        </div><!-- .entry-meta -->
-
-                                        <div class="entry-summary">
-                                                <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                                        </div><!-- .entry-summary -->
-
-                                        <div class="entry-utility">
-                                                <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
-                                                <span class="meta-sep"> | </span>
-                                                <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
-                                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                                        </div><!-- #entry-utility -->
-                                </div><!-- #post-<?php the_ID(); ?> -->
-
-<?php endwhile; ?>
-
-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
-<?php } ?>
-
</del><span class="cx">                         </div><!-- #content -->
</span><span class="cx">                 </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/category.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -10,49 +10,8 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-above -->
-<?php } ?>
</del><ins>+<?php include 'loop.php'; ?>
</ins><span class="cx">
</span><del>-<?php while ( have_posts() ) : the_post(); ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                                        <div class="entry-meta">
-                                                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                                                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                                <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
-                                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                                        </div><!-- .entry-meta -->
-
-                                        <div class="entry-summary">
-                                                <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                                        </div><!-- .entry-summary -->
-
-                                        <div class="entry-utility">
-<?php if ( $cats_meow = cats_meow( ', ' ) ) : // Returns categories other than the one queried ?>
-                                                <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ); ?></span>
-                                                <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-<?php endif ?>
-                                                <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
-                                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                                        </div><!-- #entry-utility -->
-                                </div><!-- #post-<?php the_ID(); ?> -->
-
-<?php endwhile; ?>
-
-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
-<?php } ?>
-
</del><span class="cx">                         </div><!-- #content -->
</span><span class="cx">                 </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/footer.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <?php get_sidebar( 'footer' ); ?>
</span><span class="cx">
</span><span class="cx">                         <div id="site-info">
</span><del>-                                <a href="<?php echo home_url() ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</del><ins>+                                <a href="<?php echo home_url('/') ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</ins><span class="cx">                         </div>
</span><span class="cx">
</span><span class="cx">                         <div id="site-generator">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/header.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -39,14 +39,13 @@
</span><span class="cx">                 <div id="masthead">
</span><span class="cx">
</span><span class="cx">                         <div id="branding">
</span><del>-                                <div id="site-title"><span><a href="<?php echo home_url(); ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
</del><ins>+                                <div id="site-title"><span><a href="<?php echo home_url('/'); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
</ins><span class="cx">                                 <div id="site-description"><?php bloginfo( 'description' ); ?></div>
</span><span class="cx">
</span><span class="cx">                                 <?php
</span><del>-                                        global $post;
-                                        if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
-                                                echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-                                        } else { ?>
</del><ins>+                                if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
+                                        echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
+                                } else { ?>
</ins><span class="cx">                                         <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
</span><span class="cx">                                 <?php } ?>
</span><span class="cx">                         </div><!-- #branding -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/index.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -3,101 +3,9 @@
</span><span class="cx">                 <div id="container">
</span><span class="cx">                         <div id="content">
</span><span class="cx">
</span><del>-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-above -->
-<?php } ?>
-
- <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
- <?php if ( in_category( 'Gallery' ) ) { ?>
-         <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                        <div class="entry-meta">
-                                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
-                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                        </div><!-- .entry-meta -->
-
-                        <div class="entry-content">
-                                <div class="gallery-thumb">
-                                        <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
-                                        $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
-                                        $total_images = count($images);
-                                        $image = array_shift($images);
-                                        echo wp_get_attachment_image( $image->ID, 'thumbnail' );
-                                        ?></a>
-                                </div>
-                                <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
-
-                                <?php the_excerpt( '' ); ?>
-                        </div><!-- .entry-content -->
-
-                        <div class="entry-utility">
-                                <?php
-                                 $category_id = get_cat_ID( 'Gallery' );
-                                 $category_link = get_category_link( $category_id );
-                                ?>
-                                <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
-                                <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                        </div><!-- #entry-utility -->
-                </div>
-
-
-        <?php } elseif ( in_category( 'asides' ) ) { ?>
-                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                        <div class="entry-content">
-                                <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                        </div><!-- .entry-content -->
-
-                        <div class="entry-utility">
-                                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
-                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                                <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                        </div><!-- #entry-utility -->
-                </div><!-- #post-<?php the_ID(); ?> -->
-
-
- <?php } else { ?>
-                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                        <div class="entry-meta">
-                                <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
-                                <a href="<?php
-the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
-                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                        </div><!-- .entry-meta -->
-
-                        <div class="entry-content">
-                                <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                                <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
-                        </div><!-- .entry-content -->
-
-                        <div class="entry-utility">
-                                <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
-                                <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
-                                <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                        </div><!-- #entry-utility -->
-                </div><!-- #post-<?php the_ID(); ?> -->
-
-                <?php comments_template( '', true ); ?>
-
- <?php } ?>
- <?php endwhile; ?>
- <?php else : ?>
</del><ins>+ <?php if ( have_posts() ) :
+                include 'loop.php';
+ else : ?>
</ins><span class="cx">                 <h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
</span><span class="cx">                 <div class="entry-content">
</span><span class="cx">                         <p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
</span><span class="lines">@@ -105,13 +13,6 @@
</span><span class="cx">                 </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
-<?php } ?>
-
</del><span class="cx">                         </div><!-- #content -->
</span><span class="cx">                 </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentyten/loop.php (0 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php         (rev 0)
+++ trunk/wp-content/themes/twentyten/loop.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+<?php if ( $wp_query->max_num_pages > 1 ) { ?>
+        <div id="nav-above" class="navigation">
+                <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+                <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
+        </div><!-- #nav-above -->
+<?php } ?>
+
+<?php while ( have_posts() ) : the_post(); ?>
+<?php if ( in_category( 'Gallery' ) ) { ?>
+        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+
+                <div class="entry-meta">
+                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+                        <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
+                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+                </div><!-- .entry-meta -->
+
+                <div class="entry-content">
+                        <div class="gallery-thumb">
+                                <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
+                                $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
+                                $total_images = count($images);
+                                $image = array_shift($images);
+                                echo wp_get_attachment_image( $image->ID, 'thumbnail' );
+                                ?></a>
+                        </div>
+                        <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
+
+                        <?php the_excerpt( '' ); ?>
+                </div><!-- .entry-content -->
+
+                <div class="entry-utility">
+                        <?php
+                                $category_id = get_cat_ID( 'Gallery' );
+                                $category_link = get_category_link( $category_id );
+                        ?>
+                        <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
+                        <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+                </div><!-- #entry-utility -->
+        </div>
+
+
+<?php } elseif ( in_category( 'asides' ) ) { ?>
+        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <div class="entry-content">
+                        <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                </div><!-- .entry-content -->
+
+                <div class="entry-utility">
+                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+                        <span class="meta-sep"> <?php _e( ' by ', 'twentyten' ); ?> </span>
+                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+                        <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+                </div><!-- #entry-utility -->
+        </div><!-- #post-<?php the_ID(); ?> -->
+
+
+<?php } else { ?>
+        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+
+                <div class="entry-meta">
+                        <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
+                        <a href="<?php
+the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+                        <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
+                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+                </div><!-- .entry-meta -->
+
+<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
+                <div class="entry-summary">
+                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                </div><!-- .entry-summary -->
+<?php else : ?>
+                <div class="entry-content">
+                        <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                        <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
+                </div><!-- .entry-content -->
+<?php endif; ?>
+
+                <div class="entry-utility">
+                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
+                        <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
+                        <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+                </div><!-- #entry-utility -->
+        </div><!-- #post-<?php the_ID(); ?> -->
+
+        <?php comments_template( '', true ); ?>
+
+<?php } ?>
+<?php endwhile; ?>
+
+<?php if ( $wp_query->max_num_pages > 1 ) { ?>
+                                <div id="nav-below" class="navigation">
+                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
+                                </div><!-- #nav-below -->
+<?php } ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/search.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -4,57 +4,9 @@
</span><span class="cx">                         <div id="content">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><del>-
</del><span class="cx">                                 <h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
</span><del>-
-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-above -->
-<?php } ?>
-
-<?php while ( have_posts() ) : the_post(); ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-<?php if ( $post->post_type != 'page' ) : ?>
-                                        <div class="entry-meta">
-                                                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                                                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                                <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
-                                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                                        </div><!-- .entry-meta -->
-<?php endif; ?>
-
-                                        <div class="entry-summary">
-                                                <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                                                <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
-                                        </div><!-- .entry-summary -->
-
-<?php if ( $post->post_type != 'page' ) : ?>
-                                        <div class="entry-utility">
-                                                <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
-                                                <span class="meta-sep"> | </span>
-                                                <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
-                                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                                        </div><!-- #entry-utility -->
-<?php endif; ?>
-                                </div><!-- #post-<?php the_ID(); ?> -->
-
-<?php endwhile; ?>
-
-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
-<?php } ?>
-
</del><ins>+        <?php include 'loop.php'; ?>
</ins><span class="cx"> <?php else : ?>
</span><del>-
</del><span class="cx">                                 <div id="post-0" class="post no-results not-found">
</span><span class="cx">                                         <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
</span><span class="cx">                                         <div class="entry-content">
</span><span class="lines">@@ -62,9 +14,7 @@
</span><span class="cx">                                                 <?php get_search_form(); ?>
</span><span class="cx">                                         </div><!-- .entry-content -->
</span><span class="cx">                                 </div>
</span><del>-
</del><span class="cx"> <?php endif; ?>
</span><del>-
</del><span class="cx">                         </div><!-- #content -->
</span><span class="cx">                 </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php        2010-02-14 06:34:47 UTC (rev 13140)
+++ trunk/wp-content/themes/twentyten/tag.php        2010-02-14 07:13:34 UTC (rev 13141)
</span><span class="lines">@@ -9,49 +9,8 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-above -->
-<?php } ?>
</del><ins>+<?php include 'loop.php'; ?>
</ins><span class="cx">
</span><del>-<?php while ( have_posts() ) : the_post(); ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                                        <div class="entry-meta">
-                                                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                                                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                                                <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
-                                                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                                        </div><!-- .entry-meta -->
-
-                                        <div class="entry-summary">
-                                                <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                                        </div><!-- .entry-summary -->
-
-                                        <div class="entry-utility">
-                                                <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
-                                                <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-<?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
-                                                <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ); ?></span>
-<?php endif; ?>
-                                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                                        </div><!-- #entry-utility -->
-                                </div><!-- #post-<?php the_ID(); ?> -->
-
-<?php endwhile; ?>
-
-<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
-<?php } ?>
-
</del><span class="cx">                         </div><!-- #content -->
</span><span class="cx">                 </div><!-- #container -->
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>