From 5dc3b77be39b499c1e9b6b757256a9aec86d80d8 Mon Sep 17 00:00:00 2001
From: Lance Willett <nanobar@gmail.com>
Date: Thu, 19 Feb 2015 19:43:28 +0000
Subject: [PATCH] Twenty Fourteen: make `twentyfourteen_post_thumbnail()`
 pluggable.

Fixes #31374, props wordpressorru.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31462 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfourteen/inc/template-tags.php | 2 ++
 wp-includes/version.php                                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-content/themes/twentyfourteen/inc/template-tags.php b/wp-content/themes/twentyfourteen/inc/template-tags.php
index 084f97ae1f..1d7576f06c 100644
--- a/wp-content/themes/twentyfourteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfourteen/inc/template-tags.php
@@ -161,6 +161,7 @@ function twentyfourteen_category_transient_flusher() {
 add_action( 'edit_category', 'twentyfourteen_category_transient_flusher' );
 add_action( 'save_post',     'twentyfourteen_category_transient_flusher' );
 
+if ( ! function_exists( 'twentyfourteen_post_thumbnail' ) ) :
 /**
  * Display an optional post thumbnail.
  *
@@ -201,6 +202,7 @@ function twentyfourteen_post_thumbnail() {
 
 	<?php endif; // End is_singular()
 }
+endif;
 
 if ( ! function_exists( 'twentyfourteen_excerpt_more' ) && ! is_admin() ) :
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 09ca7b55d3..81246d64ee 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31480';
+$wp_version = '4.2-alpha-31481';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.