Ticket #15080: 15080.args.2.diff

wp-includes/comment-template.php

@@ -1493 +1493 @@
 }
 
 /**
+ * Builds an input field bassed on arguments of your choosing
+ *
+ * Pass in an array of attributes that the input field should have.
+ * Properties can be passed as well with the value of null
+ *
+ * @param array $args attributes and the values they should have
+ */
+function input_builder($args) {
+    $input_string = '<input ';
+    foreach( $args as $attr => $val ) {
+        if (NULL === $val )
+            $input_string .= $attr . " ";
+        else
+            $input_string .= $attr . '="'. $val . '" '; 
+    }
+    $input_string .= ' />';
+    return $input_string;
+}
+
+/**
  * Outputs a complete commenting form for use within a template.
  * Most strings and form fields may be controlled through the $args array passed
  * into the function, while you may also choose to use the comment_form_default_fields
@@ -1520 +1540 @@
 
         $req = get_option( 'require_name_email' );
         $aria_req = ( $req ? " aria-required='true'" : '' );
+    $author_input_attr = array(
+        'id' => 'author',
+        'name' => 'author',
+        'type' => 'text',
+        'value' =>  esc_attr( $commenter['comment_author'] ),
+        'size' => '30',
+        'aria-required' => ( $req) ? 'true' : 'false',
+    );
+    $email_input_attr = array(
+        'id' => 'email',
+        'name' => 'eamil',
+        'type' => 'text',
+        'value' =>  esc_attr( $commenter['comment_author_email'] ),
+        'size' => '30',
+        'aria-required' => ( $req) ? 'true' : 'false',
+    );
+    $url_input_attr = array(
+        'id' => 'url',
+        'name' => 'url',
+        'type' => 'text',
+        'value' => esc_attr( $commenter['comment_author_url'] ),
+        'size' => '30'
+    );
+    if (isset($args['html5']) && $args['html5'] == true){
+        $email_input_attr['type'] = 'email';
+        $email_input_attr['pattern'] = '';
+        $url_input_attr['type'] = 'url';
+        $url_input_attr['pattern'] = '';
+        if ($req){
+            $author_input_attr['required'] = null;
+            $email_input_attr['required'] = null;
+        }
+
+    }
+
         $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>',
+                                        input_builder($author_input_attr) . '</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_builder($email_input_attr) . '</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_builder($url_input_attr) . '</p>',
         );
 
         $required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
@@ -1556 +1612 @@
                                         <?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 (isset($args['html5']) && $args['html5'] == true) ? '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 ); ?>