Changeset 25236

Timestamp:

09/04/2013 05:46:08 PM (11 years ago)

Author:

nacin

Message:

Fix 'html5' theme support.

• Merge, rather than replace, on second add.
• Make current_theme_supports() work when two arguments are passed.
• Require the second argument to be an array.

Merges [25193] and [25235] to the 3.6 branch.
fixes #24932.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-includes/theme.php (modified) (2 diffs)

branches/3.6/wp-includes/theme.php

@@ -1265 +1265 @@
             break;
 
+        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] ) ) {
+                _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.
+            if ( isset( $_wp_theme_features['html5'] ) )
+                $args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+            break;
+
         case 'custom-header-uploads' :
             return add_theme_support( 'custom-header', array( 'uploads' => true ) );
@@ -1548 +1562 @@
             break;
 
+        case 'html5':
         case 'post-formats':
             // specific post formats can be registered by passing an array of types to
             // add_theme_support()
-            $post_format = $args[0];
-            return in_array( $post_format, $_wp_theme_features[$feature][0] );
+
+            // Specific areas of HTML5 support *must* be passed via an array to add_theme_support()
+
+            $type = $args[0];
+            return in_array( $type, $_wp_theme_features[$feature][0] );
             break;