Ticket #10910: 10910.diff

wp-includes/comment-template.php

@@ -811 +811 @@
  * @return null Returns null if no comments appear
  */
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
-        global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
+        global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage, $req, $commenter, $comment_author, $comment_author_email, $comment_author_url;
 
         if ( !(is_single() || is_page() || $withcomments) || empty($post) )
                 return;
 
         if ( empty($file) )
                 $file = '/comments.php';
-
+        
         $req = get_option('require_name_email');
 
         /**
@@ -1396 +1396 @@
         $in_comment_loop = false;
 }
 
+/**
+ * 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 comments_form_default_fields
+ * filter to modify the array of default fields if you'd just like to add a new
+ * one or remove a single field. All fields are also individually passed through
+ * a filter of the form comments_form_field_$name where $name is the key used
+ * in the array of fields.
+ *
+ * @since x.x
+ * @param array $args Options for strings, fields etc in the form
+ * @param mixed $post_id Post ID to generate the form for, uses the current post if null
+ * @return void
+ */
+function comment_form( $args = array(), $post_id = null ) {
+        global $req, $commenter, $comment_author, $comment_author_email, $comment_author_url, $user_identity, $id;
+                
+        if ( null === $post_id )
+                $post_id = $id;
+        else
+                $id = $post_id;
+        
+        $aria_req = ( $req ? " aria-required='true'" : '' );
+        $req_str  = ( $req ? __( ' (required)' ) : '' );
+        $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p><input type="text" name="author" id="author" value="' . esc_attr( $comment_author ) . '" size="22" tabindex="1"' . $aria_req . ' /> <label for="author"><small>' . __( 'Name' ) . $req_str . '</small></label></p>', 
+                                                                                                                                                                            'email'  => '<p><input type="text" name="email" id="email" value="' . esc_attr( $comment_author_email ) . '" size="22" tabindex="2"' . $aria_req . ' /> <label for="email"><small>' . __( 'Mail (will not be published)' ) . $req_str . '</small></label></p>', 
+                                                                                                                                                                            'url'    => '<p><input type="text" name="url" id="url" value="' . esc_attr( $comment_author_url ) . '" size="22" tabindex="3" /> <label for="url"><small>' . __( 'Website' ) . '</small></label></p>' ) ),
+                                                'comment_form_comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>', 
+                                                'must_log_in' => '<p>' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( get_permalink( $post_id ) ) ) . '</p>', 
+                                                'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out &raquo;</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( get_permalink( $post_id ) ) ), 
+                                );
+        $args = wp_parse_args( $args, $defaults );
+        
+        do_action( 'comment_form_before' );
+        ?>
+                <?php if ( comments_open() ) : ?>
+                        <div id="respond">
+                                <h3><?php comment_form_title( apply_filters( 'comment_form_title', __( 'Leave a Reply' ) ), apply_filters( 'comment_form_title_reply_to', __( 'Leave a Reply to %s' ) ) ); ?></h3>
+                                <div class="cancel-comment-reply">
+                                        <small><?php cancel_comment_reply_link( apply_filters( 'comment_form_cancel_reply', '' ) ); ?></small>
+                                </div>
+                                <?php if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
+                                        <?php echo apply_filters( 'comment_form_must_log_in', $args['must_log_in'] ); ?>
+                                        <?php do_action( 'comment_form_must_log_in_after' ); ?>
+                                <?php else : ?>
+                                        <form action="<?php echo get_option( 'siteurl' ); ?>/wp-comments-post.php" method="post" id="commentform">
+                                                <?php if ( is_user_logged_in() ) : ?>
+                                                        <?php echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity ); ?>
+                                                        <?php do_action( 'comment_form_logged_in_after', $commenter, $user_identity ); ?>
+                                                <?php else : ?>
+                                                        <?php
+                                                        do_action( 'comment_form_before_fields' );
+                                                        foreach ( $args['fields'] as $name => $field ) {
+                                                                echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+                                                        }
+                                                        do_action( 'comment_form_after_fields' );
+                                                        ?>
+                                                <?php endif; ?>
+                                                <?php echo apply_filters( 'comment_form_field_comment', $args['comment_form_comment_field'] ); ?>
+                                                <p>
+                                                        <input name="submit" type="submit" id="submit" tabindex="<?php echo ( count( $args['fields'] ) + 2 ); ?>" value="<?php echo apply_filters( 'comment_form_submit', __( 'Submit Comment' ) ); ?>" />
+                                                        <?php comment_id_fields(); ?>
+                                                </p>
+                                                <?php do_action( 'comments_form', $post_id ); ?>
+                                        </form>
+                                <?php endif; ?>
+                        </div>
+                <?php endif; ?>
+        <?php
+        do_action( 'comment_form_after' );
+}
+
 ?>