Ticket #23850: 23850.5.patch

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-form' ) ) ? 'html5' : 'xhtml';
         $format = apply_filters( 'search_form_format', $format );
 
         $search_form_template = locate_template( 'searchform.php' );

wp-includes/comment-template.php

@@ -1506 +1506 @@
                 'avatar_size'       => 32,
                 'reverse_top_level' => null,
                 'reverse_children'  => '',
-                'format'            => 'xhtml', // or html5
+                'format'            => ( current_theme_supports( 'html5', 'comment-list' ) ) ? 'html5' : 'xhtml',
                 'short_ping'        => false,
         );
 
@@ -1608 +1608 @@
         $user = wp_get_current_user();
         $user_identity = $user->exists() ? $user->display_name : '';
 
+        if ( ! isset( $args['format'] ) )
+                $args['format'] = ( current_theme_supports( 'html5', 'comment-form' ) ) ? 'html5' : 'xhtml';
+
         $req      = get_option( 'require_name_email' );
         $aria_req = ( $req ? " aria-required='true'" : '' );
-        $html5    = isset( $args['format'] ) && 'html5' === $args['format'];
+        $html5    = 'html5' === $args['format'];
         $fields   =  array(
                 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
                             '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>',