From d5b33742db31a013c73367f3e2f5f3ec60f404c7 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@iandanielstewart.com>
Date: Wed, 1 Feb 2012 20:21:14 +0000
Subject: [PATCH] _s: incorporating the author template into the archive
 template to reduce template bloat

git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@8835 d957f892-c61d-0410-b221-f235e6eecf30
---
 archive.php |  9 +++++++
 author.php  | 74 -----------------------------------------------------
 2 files changed, 9 insertions(+), 74 deletions(-)
 delete mode 100644 author.php

diff --git a/archive.php b/archive.php
index 56cc1ff6..1d6c7f75 100644
--- a/archive.php
+++ b/archive.php
@@ -25,7 +25,16 @@ get_header(); ?>
 								printf( __( 'Tag Archives: %s', '_s' ), '<span>' . single_tag_title( '', false ) . '</span>' );
 
 							} elseif ( is_author() ) {
+								/* Queue the first post, that way we know
+								 * what author we're dealing with (if that is the case).
+								*/
+								the_post();
 								printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+								/* Since we called the_post() above, we need to
+								 * rewind the loop back to the beginning that way
+								 * we can run the loop properly, in full.
+								 */
+								rewind_posts();
 
 							} elseif ( is_day() ) {
 								printf( __( 'Daily Archives: %s', '_s' ), '<span>' . get_the_date() . '</span>' );
diff --git a/author.php b/author.php
deleted file mode 100644
index d9a7cec7..00000000
--- a/author.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * The template for displaying Author Archive pages.
- *
- * @package _s
- * @since _s 1.0
- */
-
-get_header(); ?>
-
-		<section id="primary" class="site-content">
-			<div id="content" role="main">
-
-			<?php if ( have_posts() ) : ?>
-
-				<?php
-					/* Queue the first post, that way we know
-					 * what author we're dealing with (if that is the case).
-					 *
-					 * We reset this later so we can run the loop
-					 * properly with a call to rewind_posts().
-					 */
-					the_post();
-				?>
-
-				<header class="page-header">
-					<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
-				</header>
-
-				<?php
-					/* Since we called the_post() above, we need to
-					 * rewind the loop back to the beginning that way
-					 * we can run the loop properly, in full.
-					 */
-					rewind_posts();
-				?>
-
-				<?php _s_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php
-						/* Include the Post-Format-specific template for the content.
-						 * If you want to overload this in a child theme then include a file
-						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
-					?>
-
-				<?php endwhile; ?>
-
-				<?php _s_content_nav( 'nav-below' ); ?>
-
-			<?php else : ?>
-
-				<article id="post-0" class="post no-results not-found">
-					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
-					</header><!-- .entry-header -->
-
-					<div class="entry-content">
-						<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '_s' ); ?></p>
-						<?php get_search_form(); ?>
-					</div><!-- .entry-content -->
-				</article><!-- #post-0 -->
-
-			<?php endif; ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary .site-content -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file