Changeset 37313

Timestamp:

04/26/2016 08:28:46 PM (10 years ago)

Author:

rachelbaker

Message:

Post Thumbnails: Fix logic bug and tests from [37308] where post-thumbnails support wasn’t added if there were no previous post_types with support already.

See #22080

Location:

trunk

Files:

• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/theme/support.php (modified) (2 diffs)

trunk/src/wp-includes/theme.php

@@ -1546 +1546 @@
                          * 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] ) );
                         }
 

trunk/tests/phpunit/tests/theme/support.php

@@ -45 +45 @@
 
         public function test_post_thumbnails_flat_array_of_post_types() {
+                remove_theme_support( 'post-thumbnails' );
+
                 add_theme_support( 'post-thumbnails', array( 'post', 'page' ) );
-                $this->assertTrue( current_theme_supports( 'post-thumbnails' ) );
                 $this->assertTrue( current_theme_supports( 'post-thumbnails', 'post' ) );
                 $this->assertFalse( current_theme_supports( 'post-thumbnails', 'book' ) );
@@ -68 +69 @@
                 add_theme_support( 'post-thumbnails' );
                 $this->assertTrue( current_theme_supports( 'post-thumbnails', 'book' ) );
+
+                // Reset post-thumbnails theme support.
+                remove_theme_support( 'post-thumbnails' );
+                $this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
         }