From 10b9a6673a0647b3aaf07ba640caa7a6c2fc9e8e Mon Sep 17 00:00:00 2001
From: Thomas Guillot <thomas@automattic.com>
Date: Mon, 3 Jul 2017 10:43:21 +0100
Subject: [PATCH 1/5] _s: Add featured images to Post and Pages with the
 ability to hide them via Content Options.

_s: Fix Travis CI error

_s: Add missing coma in array
---
 inc/jetpack.php                   |  7 ++++++-
 inc/template-tags.php             | 33 +++++++++++++++++++++++++++++++
 template-parts/content-page.php   |  2 ++
 template-parts/content-search.php |  2 ++
 template-parts/content.php        |  2 ++
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/inc/jetpack.php b/inc/jetpack.php
index fda2615..172afb8 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -27,7 +27,7 @@ function _s_jetpack_setup() {
 
 	// Add theme support for Content Options.
 	add_theme_support( 'jetpack-content-options', array(
-		'post-details' => array(
+		'post-details'    => array(
 			'stylesheet' => '_s-style',
 			'date'       => '.posted-on',
 			'categories' => '.cat-links',
@@ -35,6 +35,11 @@ function _s_jetpack_setup() {
 			'author'     => '.byline',
 			'comment'    => '.comments-link',
 		),
+		'featured-images' => array(
+			'archive'    => true,
+			'post'       => true,
+			'page'       => true,
+		),
 	) );
 }
 add_action( 'after_setup_theme', '_s_jetpack_setup' );
diff --git a/inc/template-tags.php b/inc/template-tags.php
index e4b9cf0..0ff12f1 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -100,3 +100,36 @@ function _s_entry_footer() {
 	);
 }
 endif;
+
+if ( ! function_exists( '_s_post_thumbnail' ) ) :
+/**
+ * Displays an optional post thumbnail.
+ *
+ * Wraps the post thumbnail in an anchor element on index views, or a div
+ * element when on single views.
+ */
+function _s_post_thumbnail() {
+	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+		return;
+	}
+
+	if ( is_singular() ) :
+	?>
+
+	<div class="post-thumbnail">
+		<?php the_post_thumbnail(); ?>
+	</div><!-- .post-thumbnail -->
+
+	<?php else : ?>
+
+	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
+		<?php
+			the_post_thumbnail( 'post-thumbnail', array(
+				'alt' => the_title_attribute( 'echo=0' ),
+			) );
+		?>
+	</a>
+
+	<?php endif; // End is_singular().
+}
+endif;
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index 0c8ad09..a3c1f10 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -14,6 +14,8 @@
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-content">
 		<?php
 			the_content();
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index b7ac2ff..80ce08b 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -20,6 +20,8 @@
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
diff --git a/template-parts/content.php b/template-parts/content.php
index 6e3b38f..8ffc61a 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -26,6 +26,8 @@
 		endif; ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-content">
 		<?php
 			the_content( sprintf(

From 387df73308382cdf80c29fba9500609bf93a4eb6 Mon Sep 17 00:00:00 2001
From: Thomas Guillot <thomas@automattic.com>
Date: Mon, 3 Jul 2017 10:43:21 +0100
Subject: [PATCH 2/5] _s: Add featured images to Post and Pages with the
 ability to hide them via Content Options.

_s: Fix Travis CI error

_s: Add missing coma in array
---
 inc/jetpack.php                   |  7 ++++++-
 inc/template-tags.php             | 33 +++++++++++++++++++++++++++++++
 template-parts/content-page.php   |  2 ++
 template-parts/content-search.php |  2 ++
 template-parts/content.php        |  2 ++
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/inc/jetpack.php b/inc/jetpack.php
index fda2615..172afb8 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -27,7 +27,7 @@ function _s_jetpack_setup() {
 
 	// Add theme support for Content Options.
 	add_theme_support( 'jetpack-content-options', array(
-		'post-details' => array(
+		'post-details'    => array(
 			'stylesheet' => '_s-style',
 			'date'       => '.posted-on',
 			'categories' => '.cat-links',
@@ -35,6 +35,11 @@ function _s_jetpack_setup() {
 			'author'     => '.byline',
 			'comment'    => '.comments-link',
 		),
+		'featured-images' => array(
+			'archive'    => true,
+			'post'       => true,
+			'page'       => true,
+		),
 	) );
 }
 add_action( 'after_setup_theme', '_s_jetpack_setup' );
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 3260c44..d1403d4 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -100,3 +100,36 @@ if ( ! function_exists( '_s_entry_footer' ) ) :
 		);
 	}
 endif;
+
+if ( ! function_exists( '_s_post_thumbnail' ) ) :
+/**
+ * Displays an optional post thumbnail.
+ *
+ * Wraps the post thumbnail in an anchor element on index views, or a div
+ * element when on single views.
+ */
+function _s_post_thumbnail() {
+	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+		return;
+	}
+
+	if ( is_singular() ) :
+	?>
+
+	<div class="post-thumbnail">
+		<?php the_post_thumbnail(); ?>
+	</div><!-- .post-thumbnail -->
+
+	<?php else : ?>
+
+	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
+		<?php
+			the_post_thumbnail( 'post-thumbnail', array(
+				'alt' => the_title_attribute( 'echo=0' ),
+			) );
+		?>
+	</a>
+
+	<?php endif; // End is_singular().
+}
+endif;
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index 0c8ad09..a3c1f10 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -14,6 +14,8 @@
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-content">
 		<?php
 			the_content();
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index b7ac2ff..80ce08b 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -20,6 +20,8 @@
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
diff --git a/template-parts/content.php b/template-parts/content.php
index 6e3b38f..8ffc61a 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -26,6 +26,8 @@
 		endif; ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-content">
 		<?php
 			the_content( sprintf(

From ce47408461ae586210d2ff8fba2426d2d4e4cb10 Mon Sep 17 00:00:00 2001
From: Thomas Guillot <thomas@automattic.com>
Date: Thu, 28 Sep 2017 16:00:04 +0100
Subject: [PATCH 3/5] Remove `aria-hidden` attribute from the post thumbnail
 link

---
 inc/template-tags.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index 6a0330b..19cb67c 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -155,7 +155,7 @@ function _s_post_thumbnail() {
 
 	<?php else : ?>
 
-	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
+	<a class="post-thumbnail" href="<?php the_permalink(); ?>">
 		<?php
 			the_post_thumbnail( 'post-thumbnail', array(
 				'alt' => the_title_attribute( 'echo=0' ),

From 2a1a954b984ef6ce0b1269d1ecafb1282b709e69 Mon Sep 17 00:00:00 2001
From: Thomas Guillot <thomas@automattic.com>
Date: Mon, 30 Oct 2017 10:57:58 +0000
Subject: [PATCH 4/5] Replace `'echo=0'` with `array( 'echo' => false )` and
 remove duplicate function

---
 inc/template-tags.php | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index 19cb67c..fdf1929 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -125,40 +125,7 @@ function _s_post_thumbnail() {
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
 		<?php
 			the_post_thumbnail( 'post-thumbnail', array(
-				'alt' => the_title_attribute( 'echo=0' ),
-			) );
-		?>
-	</a>
-
-	<?php endif; // End is_singular().
-}
-endif;
-
-if ( ! function_exists( '_s_post_thumbnail' ) ) :
-/**
- * Displays an optional post thumbnail.
- *
- * Wraps the post thumbnail in an anchor element on index views, or a div
- * element when on single views.
- */
-function _s_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
-
-	if ( is_singular() ) :
-	?>
-
-	<div class="post-thumbnail">
-		<?php the_post_thumbnail(); ?>
-	</div><!-- .post-thumbnail -->
-
-	<?php else : ?>
-
-	<a class="post-thumbnail" href="<?php the_permalink(); ?>">
-		<?php
-			the_post_thumbnail( 'post-thumbnail', array(
-				'alt' => the_title_attribute( 'echo=0' ),
+				'alt' => the_title_attribute( array( 'echo' => false ) ),
 			) );
 		?>
 	</a>

From c6427768ef20dece15e0d8efeea9a38538062e02 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@gmail.com>
Date: Tue, 12 Dec 2017 15:26:47 -1000
Subject: [PATCH 5/5] Update array using associative keys to have each value on
 a new line.

---
 inc/template-tags.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index fdf1929..fb2d453 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -125,7 +125,9 @@ function _s_post_thumbnail() {
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
 		<?php
 			the_post_thumbnail( 'post-thumbnail', array(
-				'alt' => the_title_attribute( array( 'echo' => false ) ),
+				'alt' => the_title_attribute( array(
+					'echo' => false,
+				) ),
 			) );
 		?>
 	</a>