From 2047ff9e5a3485e9e86f6169e98c7a1fd30952ef Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Tue, 4 Nov 2014 21:01:23 +0000
Subject: [PATCH] Twenty Fifteen: Use the new archive template tags and make
 archive template titling way simpler!

Props obenland, fixes #30246.


Built from https://develop.svn.wordpress.org/trunk@30236


git-svn-id: http://core.svn.wordpress.org/trunk@30236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/archive.php | 60 +--------------------
 wp-includes/version.php                     |  2 +-
 2 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/archive.php b/wp-content/themes/twentyfifteen/archive.php
index 317c85ded5..801b86f0fb 100644
--- a/wp-content/themes/twentyfifteen/archive.php
+++ b/wp-content/themes/twentyfifteen/archive.php
@@ -25,65 +25,9 @@ get_header(); ?>
 		<?php if ( have_posts() ) : ?>
 
 			<header class="page-header">
-				<h1 class="page-title">
-					<?php
-						if ( is_category() ) :
-							single_cat_title();
-
-						elseif ( is_tag() ) :
-							single_tag_title();
-
-						elseif ( is_author() ) :
-							printf( esc_html__( 'Author: %s', 'twentyfifteen' ), '<span class="vcard">' . get_the_author() . '</span>' );
-
-						elseif ( is_day() ) :
-							printf( esc_html__( 'Day: %s', 'twentyfifteen' ), get_the_date() );
-
-						elseif ( is_month() ) :
-							printf( esc_html__( 'Month: %s', 'twentyfifteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyfifteen' ) ) );
-
-						elseif ( is_year() ) :
-							printf( esc_html__( 'Year: %s', 'twentyfifteen' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentyfifteen' ) ) );
-
-						elseif ( is_tax( 'post_format', 'post-format-aside' ) ) :
-							esc_html_e( 'Asides', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
-							esc_html_e( 'Galleries', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
-							esc_html_e( 'Images', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-video' ) ) :
-							esc_html_e( 'Videos', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-quote' ) ) :
-							esc_html_e( 'Quotes', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
-							esc_html_e( 'Links', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-status' ) ) :
-							esc_html_e( 'Statuses', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
-							esc_html_e( 'Audios', 'twentyfifteen' );
-
-						elseif ( is_tax( 'post_format', 'post-format-chat' ) ) :
-							esc_html_e( 'Chats', 'twentyfifteen' );
-
-						else :
-							esc_html_e( 'Archives', 'twentyfifteen' );
-
-						endif;
-					?>
-				</h1>
 				<?php
-					// Show an optional term description.
-					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
-					endif;
+					the_archive_title( '<h1 class="page-title">', '</h1>' );
+					the_archive_description( '<div class="taxonomy-description">', '</div>' );
 				?>
 			</header><!-- .page-header -->
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 33abdcf456..d747f17346 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30235';
+$wp_version = '4.1-alpha-30236';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.