Changeset 37308

Timestamp:

04/26/2016 05:04:25 PM (8 years ago)

Author:

rachelbaker

Message:

Post Thumbnails: When using add_theme_support( ‘post-thumbnails’, array( $post_types) ) merge the supported post_types.

Allow the adding of post-thumbnail support for one or more post_types without unsetting any previously added post_types. This matches the behavior of other uses of add_theme_support() and the expectations of a function with a prefix of “add”.
To unset post-thumbnail support use remove_theme_support() instead.

Fixes #22080

Props alexkingorg, jmichaelward, and flixos90.

Location:

trunk

Files:

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

trunk/src/wp-includes/theme.php

@@ -1536 +1536 @@
 
     switch ( $feature ) {
+        case 'post-thumbnails':
+            // All post types are already supported.
+            if ( true === get_theme_support( 'post-thumbnails' ) ) {
+                return;
+            }
+
+            /*
+             * 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 );
+            }
+
+            break;
+
         case 'post-formats' :
             if ( is_array( $args[0] ) ) {

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

@@ -51 +51 @@
         remove_theme_support( 'post-thumbnails' );
         $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' ) );
     }