From ddbde15454c082bd5f2d50e745aa3bc7cc692cb4 Mon Sep 17 00:00:00 2001
From: Rachel Baker <rachel@rachelbaker.me>
Date: Tue, 26 Apr 2016 20:29:27 +0000
Subject: [PATCH] =?UTF-8?q?Post=20Thumbnails:=20Fix=20logic=20bug=20and=20?=
 =?UTF-8?q?tests=20from=20[37308]=20where=20post-thumbnails=20support=20wa?=
 =?UTF-8?q?sn=E2=80=99t=20added=20if=20there=20were=20no=20previous=20post?=
 =?UTF-8?q?=5Ftypes=20with=20support=20already.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22080
Built from https://develop.svn.wordpress.org/trunk@37313


git-svn-id: http://core.svn.wordpress.org/trunk@37279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/theme.php   | 6 ++----
 wp-includes/version.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 2f7dc1fca7..dee0af6817 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1545,10 +1545,8 @@ function add_theme_support( $feature ) {
 			 * Merge post types with any that already declared their support
 			 * for post thumbnails.
 			 */
-			if ( is_array( $args[0] ) && is_array( $_wp_theme_features['post-thumbnails'][0] ) ) {
-				$post_types = array_unique( array_merge( $args[0], $_wp_theme_features['post-thumbnails'][0] ) );
-
-				$args = array( $post_types );
+			if ( is_array( $args[0] ) && isset( $_wp_theme_features['post-thumbnails'] ) ) {
+				$args[0] = array_unique( array_merge( $_wp_theme_features['post-thumbnails'][0], $args[0] ) );
 			}
 
 			break;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index fdd54ed064..760298054d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37309';
+$wp_version = '4.6-alpha-37313';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.