Changeset 25235

Timestamp:

09/04/2013 05:43:29 PM (13 years ago)

Author:

nacin

Message:

add_theme_support( 'html5' ) now defaults to comment-list, comment-form, and search-form.

This was the implicit case in 3.6.0, modified in [25193].

see #24932.

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

@@ -1274 +1274 @@
                 case 'html5' :
                         // You can't just pass 'html5', you need to pass an array of types.
-                        if ( ! is_array( $args[0] ) )
+                        if ( empty( $args[0] ) ) {
+                                $args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
+                        } elseif ( ! is_array( $args[0] ) ) {
+                                _doing_it_wrong( "add_theme_support( 'html5' )", 'You need to pass an array of types.', '3.6.1' );
                                 return false;
+                        }
 
                         // Calling 'html5' again merges, rather than overwrites.

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

@@ -86 +86 @@
                 $this->assertFalse( current_theme_supports( 'html5' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
-                $this->assertFalse( add_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( current_theme_supports( 'html5', 'something-else' ) );
         }
 
@@ -107 +110 @@
 
                 // It appends, rather than replaces.
-                $this->assertFalse( current_theme_supports( 'html5', 'comments-list' ) );
-                $this->assertNotSame( false, add_theme_support( 'html5', array( 'comments-list' ) ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'comment-list' ) );
+                $this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-list' ) ) );
                 $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
-                $this->assertTrue( current_theme_supports( 'html5', 'comments-list' ) );
+                $this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'search-form' ) );
 
                 // Removal is all or nothing.
                 $this->assertTrue( remove_theme_support( 'html5' ) );
-                $this->assertFalse( current_theme_supports( 'html5', 'comments-list' ) );
-                $this->assertFalse( current_theme_supports( 'html5', 'comments-form' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'comment-list' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'search-form' ) );
+        }
+
+        /**
+         * @ticket 24932
+         */
+        function test_supports_html5_invalid() {
+                remove_theme_support( 'html5' );
+                $this->assertFalse( add_theme_support( 'html5', 'comment-form' ) );
+                $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
+                $this->assertFalse( current_theme_supports( 'html5' ) );
         }