From 60f7311f1977179822e83c95745fa6787894959a Mon Sep 17 00:00:00 2001
From: Ulrich Pogson <grapplerulrich@gmail.com>
Date: Fri, 4 Dec 2015 15:51:58 +0100
Subject: [PATCH] Add support for post formats in single post

---
 single.php                        |  2 +-
 template-parts/content-single.php | 35 -------------------------------
 template-parts/content.php        |  6 +++++-
 3 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 template-parts/content-single.php

diff --git a/single.php b/single.php
index 0de466fc..d8dd6c9a 100644
--- a/single.php
+++ b/single.php
@@ -15,7 +15,7 @@ get_header(); ?>
 		<?php
 		while ( have_posts() ) : the_post();
 
-			get_template_part( 'template-parts/content', 'single' );
+			get_template_part( 'template-parts/content', get_post_format() );
 
 			the_post_navigation();
 
diff --git a/template-parts/content-single.php b/template-parts/content-single.php
deleted file mode 100644
index e95e8fff..00000000
--- a/template-parts/content-single.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Template part for displaying single posts.
- *
- * @link https://codex.wordpress.org/Template_Hierarchy
- *
- * @package _s
- */
-
-?>
-
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<header class="entry-header">
-		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-
-		<div class="entry-meta">
-			<?php _s_posted_on(); ?>
-		</div><!-- .entry-meta -->
-	</header><!-- .entry-header -->
-
-	<div class="entry-content">
-		<?php
-			the_content();
-
-			wp_link_pages( array(
-				'before' => '<div class="page-links">' . esc_html__( 'Pages:', '_s' ),
-				'after'  => '</div>',
-			) );
-		?>
-	</div><!-- .entry-content -->
-
-	<footer class="entry-footer">
-		<?php _s_entry_footer(); ?>
-	</footer><!-- .entry-footer -->
-</article><!-- #post-## -->
diff --git a/template-parts/content.php b/template-parts/content.php
index 184bc062..3e54b3cf 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -12,7 +12,11 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php
-			the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
+			if ( is_single() ) {
+				the_title( '<h1 class="entry-title">', '</h1>' );
+			} else {
+				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+			}
 
 		if ( 'post' === get_post_type() ) : ?>
 		<div class="entry-meta">