Ticket #22080: 22080.4.diff

src/wp-includes/theme.php

@@ -1535 +1535 @@
                 $args = array_slice( func_get_args(), 1 );
 
         switch ( $feature ) {
+                case 'post-thumbnails':
+                        // Support has already been added for all post types and has a boolean value of true.
+                        if ( true === get_theme_support( 'post-thumbnails' ) ) {
+                                return;
+                        }
+
+                        // Get previously added post types and merge unique values into new array as args.
+                        if ( is_array( $args[0] ) && is_array( $_wp_theme_features['post-thumbnails'][0] ) ) {
+                                $values = array_unique( array_merge( $args[0], $_wp_theme_features['post-thumbnails'][0] ) );
+                                $args   = array( $values );
+                        }
+
+                        break;
+
                 case 'post-formats' :
                         if ( is_array( $args[0] ) ) {
                                 $post_formats = get_post_format_slugs();

tests/phpunit/tests/theme/support.php

@@ -52 +52 @@
                 $this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
         }
 
+        /**
+         * @ticket 22080
+         */
+        public function test_post_thumbnails_mixed_args() {
+                add_theme_support( 'post-thumbnails', array( 'post', 'page' ) );
+                add_theme_support( 'post-thumbnails', array( 'page' ) );
+                $this->assertTrue( current_theme_support( 'post-thumbnails', 'post' ) );
+                $this->assertFalse( current_theme_supports( 'post-thumbnails', 'book' ) );
+                $this->assertEquals(
+                        array( 0 => array( 'post', 'page' ) ),
+                        get_theme_support( 'post-thumbnails' )
+                );
+                add_theme_support( 'post-thumbnails' );
+                $this->assertTrue( current_theme_supports( 'post-thumbnails', 'book' ) );
+        }
+
         public function test_post_thumbnails_types_true() {
                 // array of arguments, with the key of 'types' holding the post types.
                 add_theme_support( 'post-thumbnails', array( 'types' => true ) );