From afe7f94304ce84a468bd434ed92998b0e0794801 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Sat, 31 Aug 2013 01:29:08 +0000
Subject: [PATCH] Fix 'html5' theme support.  * Require it to have a second
 argument when adding.  * Merge, rather than replace, on second add.  * Make
 current_theme_supports() work when two arguments are passed.

Adds unit tests.

props nathanrice for initial patch.
see #24932 for trunk.


git-svn-id: https://develop.svn.wordpress.org/trunk@25193 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/theme.php             | 18 ++++++++++--
 tests/phpunit/tests/theme/support.php | 41 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index 49049dbdbd..51ef24ada8 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -1271,6 +1271,16 @@ function add_theme_support( $feature ) {
 				$args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) );
 			break;
 
+		case 'html5' :
+			// You can't just pass 'html5', you need to pass an array of types.
+			if ( ! is_array( $args[0] ) )
+				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 ) );
 			break;
@@ -1554,11 +1564,15 @@ function current_theme_supports( $feature ) {
 			return in_array( $content_type, $_wp_theme_features[$feature][0] );
 			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;
 
 		case 'custom-header':
diff --git a/tests/phpunit/tests/theme/support.php b/tests/phpunit/tests/theme/support.php
index 881052c9ae..08666145a2 100644
--- a/tests/phpunit/tests/theme/support.php
+++ b/tests/phpunit/tests/theme/support.php
@@ -78,6 +78,47 @@ class Tests_Theme_Support extends WP_UnitTestCase {
 
 	}
 
+	/**
+	 * @ticket 24932
+	 */
+	function test_supports_html5() {
+		remove_theme_support( 'html5' );
+		$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' ) );
+	}
+
+	/**
+	 * @ticket 24932
+	 */
+	function test_supports_html5_subset() {
+		remove_theme_support( 'html5' );
+		$this->assertFalse( current_theme_supports( 'html5' ) );
+		$this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
+		$this->assertFalse( add_theme_support( 'html5', 'comment-form' ) );
+		$this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-form' ) ) );
+		$this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
+
+		// This will return true, which might help a plugin author decide what markup to serve,
+		// but core should never check for it.
+		$this->assertTrue( current_theme_supports( 'html5' ) );
+
+		// It appends, rather than replaces.
+		$this->assertFalse( current_theme_supports( 'html5', 'comments-list' ) );
+		$this->assertNotSame( false, add_theme_support( 'html5', array( 'comments-list' ) ) );
+		$this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
+		$this->assertTrue( current_theme_supports( 'html5', 'comments-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', 'search-form' ) );
+	}
+
 	function supports_foobar( $yesno, $args, $feature ) {
 		if ( $args[0] == $feature[0] )
 			return true;