Ticket #23850: 23850.3.diff

wp-includes/comment-template.php

@@ -1608 +1608 @@
         $user = wp_get_current_user();
         $user_identity = $user->exists() ? $user->display_name : '';
 
+        if ( ! isset( $args['format'] ) )
+                $args['format'] = ( current_theme_supports( 'html5', 'comments' ) ) ? 'html5' : 'xhtml';
+
         $req      = get_option( 'require_name_email' );
         $aria_req = ( $req ? " aria-required='true'" : '' );
         $html5    = isset( $args['format'] ) && 'html5' === $args['format'];

wp-includes/general-template.php

@@ -155 +155 @@
 function get_search_form( $echo = true ) {
         do_action( 'pre_get_search_form' );
 
-        $format = ( current_theme_supports( 'html5-search-form' ) ) ? 'html5' : 'xhtml';
+        $format = ( current_theme_supports( 'html5', 'search' ) ) ? 'html5' : 'xhtml';
         $format = apply_filters( 'search_form_format', $format );
 
         $search_form_template = locate_template( 'searchform.php' );