Ticket #15080: 15080.7.diff

wp-includes/comment-template.php

@@ -1518 +1518 @@
         $user = wp_get_current_user();
         $user_identity = $user->exists() ? $user->display_name : '';
 
-        $req = get_option( 'require_name_email' );
+        $req      = get_option( 'require_name_email' );
         $aria_req = ( $req ? " aria-required='true'" : '' );
-        $fields =  array(
+        $html5    = isset( $args['format'] ) && '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>',
                 'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-                            '<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
+                            '<input id="email" name="email" ' . ( $html5 ? 'type="email" pattern=""' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
                 'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' .
-                            '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
+                            '<input id="url" name="url" ' . ( $html5 ? 'type="url" pattern=""' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
         );
 
         $required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
         $defaults = array(
                 'fields'               => apply_filters( 'comment_form_default_fields', $fields ),
                 'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
-                'must_log_in'          => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
-                'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
-                'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>',
-                'comment_notes_after'  => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
+                'must_log_in'          => '<p class="must-log-in"><label for="author">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</label></p>',
+                'logged_in_as'         => '<p class="logged-in-as"><label for="author">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</label></p>',
+                'comment_notes_before' => '<p class="comment-notes"><label for="name">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</label></p>',
+                'comment_notes_after'  => '<p class="form-allowed-tags"><label for="name">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</label></p>',
                 'id_form'              => 'commentform',
                 'id_submit'            => 'submit',
                 'title_reply'          => __( 'Leave a Reply' ),
                 'title_reply_to'       => __( 'Leave a Reply to %s' ),
                 'cancel_reply_link'    => __( 'Cancel reply' ),
                 'label_submit'         => __( 'Post Comment' ),
+                'format'               => 'xhtml',
         );
 
         $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
@@ -1556 +1558 @@
                                         <?php echo $args['must_log_in']; ?>
                                         <?php do_action( 'comment_form_must_log_in_after' ); ?>
                                 <?php else : ?>
-                                        <form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>">
+                                        <form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
                                                 <?php do_action( 'comment_form_top' ); ?>
                                                 <?php if ( is_user_logged_in() ) : ?>
                                                         <?php echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity ); ?>