Ticket #27278: 27278.3.diff

src/wp-includes/theme.php

@@ -1379 +1379 @@
  * The init hook may be too late for some features.
  *
  * @since 2.9.0
+ *
  * @param string $feature the feature being added
+ * @return void|bool False if trying to add html5 support and not passing an array as 2nd argument
  */
 function add_theme_support( $feature ) {
         global $_wp_theme_features;
@@ -1397 +1399 @@
 
                 case 'html5' :
                         // You can't just pass 'html5', you need to pass an array of types.
-                        if ( empty( $args[0] ) ) {
-                                $args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
-                        } elseif ( ! is_array( $args[0] ) ) {
+                        // Note: as of 3.9.0 core supports the types 'comment-list', 'comment-form', 'search-form' and 'gallery'
+                        if ( ! is_array( $args[0] ) ) {
                                 _doing_it_wrong( "add_theme_support( 'html5' )", 'You need to pass an array of types.', '3.6.1' );
                                 return false;
                         }

tests/phpunit/tests/theme/support.php

@@ -80 +80 @@
 
         /**
          * @ticket 24932
+         *
+         * @expectedIncorrectUsage add_theme_support( 'html5' )
          */
         function test_supports_html5() {
                 remove_theme_support( 'html5' );
                 $this->assertFalse( current_theme_supports( 'html5' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
-                $this->assertNotSame( false, add_theme_support( 'html5' ) );
-                $this->assertTrue( current_theme_supports( 'html5' ) );
-                $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
-                $this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
-                $this->assertTrue( current_theme_supports( 'html5', 'search-form' ) );
+                $this->assertFalse( add_theme_support( 'html5' ) );
+                $this->assertFalse( current_theme_supports( 'html5' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'comment-list' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'search-form' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'gallery' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'something-else' ) );
         }