X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4713a14935b83517997f3c88f808eb41da55033d..a7cd4c052013b423c6301153f68c7fdbaa2a447b:/wp-includes/comment-template.php diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 978221f9..4e75e7bc 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -35,10 +35,13 @@ function get_comment_author( $comment_ID = 0 ) { * Filter the returned comment author name. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * - * @param string $author The comment author's username. + * @param string $author The comment author's username. + * @param int $comment_ID The comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_author', $author ); + return apply_filters( 'get_comment_author', $author, $comment_ID, $comment ); } /** @@ -50,14 +53,17 @@ function get_comment_author( $comment_ID = 0 ) { */ function comment_author( $comment_ID = 0 ) { $author = get_comment_author( $comment_ID ); + /** * Filter the comment author's name for display. * * @since 1.2.0 + * @since 4.1.0 The `$comment_ID` parameter was added. * - * @param string $author The comment author's username. + * @param string $author The comment author's username. + * @param int $comment_ID The comment ID. */ - $author = apply_filters( 'comment_author', $author ); + $author = apply_filters( 'comment_author', $author, $comment_ID ); echo $author; } @@ -71,14 +77,18 @@ function comment_author( $comment_ID = 0 ) { */ function get_comment_author_email( $comment_ID = 0 ) { $comment = get_comment( $comment_ID ); + /** * Filter the comment author's returned email address. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $comment_author_email The comment author's email address. + * @param int $comment_ID The comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_author_email', $comment->comment_author_email ); + return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment_ID, $comment ); } /** @@ -96,14 +106,17 @@ function get_comment_author_email( $comment_ID = 0 ) { */ function comment_author_email( $comment_ID = 0 ) { $author_email = get_comment_author_email( $comment_ID ); + /** * Filter the comment author's email for display. * * @since 1.2.0 + * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $author_email The comment author's email address. + * @param int $comment_ID The comment ID. */ - echo apply_filters( 'author_email', $author_email ); + echo apply_filters( 'author_email', $author_email, $comment_ID ); } /** @@ -147,17 +160,20 @@ function comment_author_email_link( $linktext = '', $before = '', $after = '' ) */ function get_comment_author_email_link( $linktext = '', $before = '', $after = '' ) { global $comment; + /** * Filter the comment author's email for display. * * Care should be taken to protect the email address and assure that email - * harvesters do not capture your commenters' email address. + * harvesters do not capture your commenter's email address. * * @since 1.2.0 + * @since 4.1.0 The `$comment` parameter was added. * * @param string $comment_author_email The comment author's email address. + * @param object $comment The comment object. */ - $email = apply_filters( 'comment_email', $comment->comment_author_email ); + $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment ); if ((!empty($email)) && ($email != '@')) { $display = ($linktext != '') ? $linktext : $email; $return = $before; @@ -194,11 +210,14 @@ function get_comment_author_link( $comment_ID = 0 ) { * Filter the comment author's link for display. * * @since 1.5.0 + * @since 4.1.0 The `$author` and `$comment_ID` parameters were added. * - * @param string $return The HTML-formatted comment author link. - * Empty for an invalid URL. + * @param string $return The HTML-formatted comment author link. + * Empty for an invalid URL. + * @param string $author The comment author's username. + * @param int $comment_ID The comment ID. */ - return apply_filters( 'get_comment_author_link', $return ); + return apply_filters( 'get_comment_author_link', $return, $author, $comment_ID ); } /** @@ -231,10 +250,13 @@ function get_comment_author_IP( $comment_ID = 0 ) { * Filter the comment author's returned IP address. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $comment_author_IP The comment author's IP address. + * @param int $comment_ID The comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP ); + return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment_ID, $comment ); } /** @@ -262,14 +284,18 @@ function get_comment_author_url( $comment_ID = 0 ) { $comment = get_comment( $comment_ID ); $url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url; $url = esc_url( $url, array('http', 'https') ); + /** * Filter the comment author's URL. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * - * @param string $url The comment author's URL. + * @param string $url The comment author's URL. + * @param int $comment_ID The comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_author_url', $url ); + return apply_filters( 'get_comment_author_url', $url, $comment_ID, $comment ); } /** @@ -282,14 +308,17 @@ function get_comment_author_url( $comment_ID = 0 ) { */ function comment_author_url( $comment_ID = 0 ) { $author_url = get_comment_author_url( $comment_ID ); + /** * Filter the comment author's URL for display. * * @since 1.2.0 + * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $author_url The comment author's URL. + * @param int $comment_ID The comment ID. */ - echo apply_filters( 'comment_url', $author_url ); + echo apply_filters( 'comment_url', $author_url, $comment_ID ); } /** @@ -317,8 +346,11 @@ function get_comment_author_url_link( $linktext = '', $before = '', $after = '' $display = ($linktext != '') ? $linktext : $url; $display = str_replace( 'http://www.', '', $display ); $display = str_replace( 'http://', '', $display ); - if ( '/' == substr($display, -1) ) + + if ( '/' == substr($display, -1) ) { $display = substr($display, 0, -1); + } + $return = "$before$display$after"; /** @@ -445,9 +477,10 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) { * @param array $classes An array of comment classes. * @param string $class A comma-separated list of additional classes added to the list. * @param int $comment_id The comment id. + * @param object $comment The comment * @param int|WP_Post $post_id The post ID or WP_Post object. */ - return apply_filters( 'comment_class', $classes, $class, $comment_id, $post_id ); + return apply_filters( 'comment_class', $classes, $class, $comment_id, $comment, $post_id ); } /** @@ -506,6 +539,7 @@ function get_comment_excerpt( $comment_ID = 0 ) { $comment = get_comment( $comment_ID ); $comment_text = strip_tags($comment->comment_content); $blah = explode(' ', $comment_text); + if (count($blah) > 20) { $k = 20; $use_dotdotdot = 1; @@ -513,6 +547,7 @@ function get_comment_excerpt( $comment_ID = 0 ) { $k = count($blah); $use_dotdotdot = 0; } + $excerpt = ''; for ($i=0; $i<$k; $i++) { $excerpt .= $blah[$i] . ' '; @@ -523,10 +558,13 @@ function get_comment_excerpt( $comment_ID = 0 ) { * Filter the retrieved comment excerpt. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * - * @param string $excerpt The comment excerpt text. + * @param string $excerpt The comment excerpt text. + * @param int $comment_ID The comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_excerpt', $excerpt ); + return apply_filters( 'get_comment_excerpt', $excerpt, $comment_ID, $comment ); } /** @@ -539,14 +577,17 @@ function get_comment_excerpt( $comment_ID = 0 ) { */ function comment_excerpt( $comment_ID = 0 ) { $comment_excerpt = get_comment_excerpt($comment_ID); + /** * Filter the comment excerpt for display. * * @since 1.2.0 + * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $comment_excerpt The comment excerpt text. + * @param int $comment_ID The comment ID. */ - echo apply_filters( 'comment_excerpt', $comment_excerpt ); + echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment_ID ); } /** @@ -558,14 +599,17 @@ function comment_excerpt( $comment_ID = 0 ) { */ function get_comment_ID() { global $comment; + /** * Filter the returned comment ID. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` parameter was added. * - * @param int $comment_ID The current comment ID. + * @param int $comment_ID The current comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_ID', $comment->comment_ID ); + return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment ); } /** @@ -641,7 +685,7 @@ function get_comment_link( $comment = null, $args = array() ) { * * @since 1.5.0 * - * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post. + * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post. * @return string The link to the comments. */ function get_comments_link( $post_id = 0 ) { @@ -663,7 +707,7 @@ function get_comments_link( $post_id = 0 ) { * @since 0.71 * * @param string $deprecated Not Used. - * @param bool $deprecated_2 Not Used. + * @param string $deprecated_2 Not Used. */ function comments_link( $deprecated = '', $deprecated_2 = '' ) { if ( !empty( $deprecated ) ) @@ -678,28 +722,26 @@ function comments_link( $deprecated = '', $deprecated_2 = '' ) { * * @since 1.5.0 * - * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post. + * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post. * @return int The number of comments a post has. */ function get_comments_number( $post_id = 0 ) { - $post_id = absint( $post_id ); - - if ( !$post_id ) - $post_id = get_the_ID(); + $post = get_post( $post_id ); - $post = get_post($post_id); - if ( ! isset($post->comment_count) ) + if ( ! $post ) { $count = 0; - else + } else { $count = $post->comment_count; + $post_id = $post->ID; + } /** * Filter the returned comment count for a post. * * @since 1.5.0 * - * @param int $count Nnumber of comments a post has. - * @param int|WP_Post $post_id Post ID or WP_Post object. + * @param int $count Number of comments a post has. + * @param int $post_id Post ID. */ return apply_filters( 'get_comments_number', $count, $post_id ); } @@ -715,18 +757,31 @@ function get_comments_number( $post_id = 0 ) { * @param string $deprecated Not used. */ function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) { - if ( !empty( $deprecated ) ) + if ( ! empty( $deprecated ) ) { _deprecated_argument( __FUNCTION__, '1.3' ); + } + echo get_comments_number_text( $zero, $one, $more ); +} +/** + * Display the language string for the number of comments the current post has. + * + * @since 4.0.0 + * + * @param string $zero Optional. Text for no comments. Default false. + * @param string $one Optional. Text for one comment. Default false. + * @param string $more Optional. Text for more than one comment. Default false. + */ +function get_comments_number_text( $zero = false, $one = false, $more = false ) { $number = get_comments_number(); - if ( $number > 1 ) - $output = str_replace('%', number_format_i18n($number), ( false === $more ) ? __('% Comments') : $more); - elseif ( $number == 0 ) - $output = ( false === $zero ) ? __('No Comments') : $zero; - else // must be one - $output = ( false === $one ) ? __('1 Comment') : $one; - + if ( $number > 1 ) { + $output = str_replace( '%', number_format_i18n( $number ), ( false === $more ) ? __( '% Comments' ) : $more ); + } elseif ( $number == 0 ) { + $output = ( false === $zero ) ? __( 'No Comments' ) : $zero; + } else { // must be one + $output = ( false === $one ) ? __( '1 Comment' ) : $one; + } /** * Filter the comments count for display. * @@ -738,7 +793,7 @@ function comments_number( $zero = false, $one = false, $more = false, $deprecate * is equal to 0, 1, or 1+. * @param int $number The number of post comments. */ - echo apply_filters( 'comments_number', $output, $number ); + return apply_filters( 'comments_number', $output, $number ); } /** @@ -858,10 +913,13 @@ function get_comment_type( $comment_ID = 0 ) { * Filter the returned comment type. * * @since 1.5.0 + * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $comment_type The type of comment, such as 'comment', 'pingback', or 'trackback'. + * @param int $comment_ID The comment ID. + * @param object $comment The comment object. */ - return apply_filters( 'get_comment_type', $comment->comment_type ); + return apply_filters( 'get_comment_type', $comment->comment_type, $comment_ID, $comment ); } /** @@ -1101,15 +1159,21 @@ function comments_template( $file = '/comments.php', $separate_comments = false */ $comment_author_url = esc_url($commenter['comment_author_url']); - /** @todo Use API instead of SELECTs. */ - if ( $user_ID) { - $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND (comment_approved = '1' OR ( user_id = %d AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, $user_ID)); - } else if ( empty($comment_author) ) { - $comments = get_comments( array('post_id' => $post->ID, 'status' => 'approve', 'order' => 'ASC') ); - } else { - $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, wp_specialchars_decode($comment_author,ENT_QUOTES), $comment_author_email)); + $comment_args = array( + 'order' => 'ASC', + 'orderby' => 'comment_date_gmt', + 'status' => 'approve', + 'post_id' => $post->ID, + ); + + if ( $user_ID ) { + $comment_args['include_unapproved'] = array( $user_ID ); + } else if ( ! empty( $comment_author_email ) ) { + $comment_args['include_unapproved'] = array( $comment_author_email ); } + $comments = get_comments( $comment_args ); + /** * Filter the comments array. * @@ -1289,42 +1353,68 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c * @param int $comment Comment being replied to. Default current comment. * @param int|WP_Post $post Post ID or WP_Post object the comment is going to be displayed on. * Default current post. - * @return mixed Link to show comment form, if successful. False, if comments are closed. + * @return null|false|string Link to show comment form, if successful. False, if comments are closed. */ -function get_comment_reply_link($args = array(), $comment = null, $post = null) { +function get_comment_reply_link( $args = array(), $comment = null, $post = null ) { $defaults = array( - 'add_below' => 'comment', - 'respond_id' => 'respond', - 'reply_text' => __('Reply'), - 'login_text' => __('Log in to Reply'), - 'depth' => 0, - 'before' => '', - 'after' => '' + 'add_below' => 'comment', + 'respond_id' => 'respond', + 'reply_text' => __( 'Reply' ), + 'reply_to_text' => __( 'Reply to %s' ), + 'login_text' => __( 'Log in to Reply' ), + 'depth' => 0, + 'before' => '', + 'after' => '' ); - $args = wp_parse_args($args, $defaults); + $args = wp_parse_args( $args, $defaults ); - if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) + if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) { return; + } - extract($args, EXTR_SKIP); + $comment = get_comment( $comment ); - $comment = get_comment($comment); - if ( empty($post) ) + if ( empty( $post ) ) { $post = $comment->comment_post_ID; - $post = get_post($post); + } - if ( !comments_open($post->ID) ) - return false; + $post = get_post( $post ); - $link = ''; + if ( ! comments_open( $post->ID ) ) { + return false; + } - if ( get_option('comment_registration') && ! is_user_logged_in() ) - $link = '' . $login_text . ''; - else - $link = "comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text"; + /** + * Filter the comment reply link arguments. + * + * @since 4.1.0 + * + * @param array $args Comment reply link arguments. See {@see get_comment_reply_link()} + * for more information on accepted arguments. + * @param object $comment The object of the comment being replied to. + * @param WP_Post $post The {@see WP_Post} object. + */ + $args = apply_filters( 'comment_reply_link_args', $args, $comment, $post ); + if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) { + $link = sprintf( '%s', + esc_url( wp_login_url( get_permalink() ) ), + $args['login_text'] + ); + } else { + $onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )', + $args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID + ); + + $link = sprintf( "%s", + esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'], + $onclick, + esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ), + $args['reply_text'] + ); + } /** * Filter the comment reply link. * @@ -1335,7 +1425,7 @@ function get_comment_reply_link($args = array(), $comment = null, $post = null) * @param object $comment The object of the comment being replied. * @param WP_Post $post The WP_Post object. */ - return apply_filters( 'comment_reply_link', $before . $link . $after, $args, $comment, $post ); + return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post ); } /** @@ -1376,7 +1466,7 @@ function comment_reply_link($args = array(), $comment = null, $post = null) { * } * @param int|WP_Post $post Optional. Post ID or WP_Post object the comment is going to be displayed on. * Default current post. - * @return string|bool|null Link to show comment form, if successful. False, if comments are closed. + * @return false|null|string Link to show comment form, if successful. False, if comments are closed. */ function get_post_reply_link($args = array(), $post = null) { $defaults = array( @@ -1389,18 +1479,30 @@ function get_post_reply_link($args = array(), $post = null) { ); $args = wp_parse_args($args, $defaults); - extract($args, EXTR_SKIP); + $post = get_post($post); - if ( !comments_open($post->ID) ) + if ( ! comments_open( $post->ID ) ) { return false; + } - if ( get_option('comment_registration') && ! is_user_logged_in() ) - $link = '' . $login_text . ''; - else - $link = "$reply_text"; - - $formatted_link = $before . $link . $after; + if ( get_option('comment_registration') && ! is_user_logged_in() ) { + $link = sprintf( '%s', + wp_login_url( get_permalink() ), + $args['login_text'] + ); + } else { + $onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )', + $args['add_below'], $post->ID, $args['respond_id'] + ); + + $link = sprintf( "%s", + get_permalink( $post->ID ) . '#' . $args['respond_id'], + $onclick, + $args['reply_text'] + ); + } + $formatted_link = $args['before'] . $link . $args['after']; /** * Filter the formatted post comments link HTML. * @@ -1508,7 +1610,7 @@ function comment_id_fields( $id = 0 ) { /** * Display text based on comment reply status. * - * Only affects users with Javascript disabled. + * Only affects users with JavaScript disabled. * * @since 2.7.0 * @@ -1552,7 +1654,7 @@ class Walker_Comment extends Walker { * @since 2.7.0 * @var string */ - var $tree_type = 'comment'; + public $tree_type = 'comment'; /** * DB fields to use. @@ -1562,7 +1664,7 @@ class Walker_Comment extends Walker { * @since 2.7.0 * @var array */ - var $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID'); + public $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID'); /** * Start the list before the elements are added. @@ -1575,7 +1677,7 @@ class Walker_Comment extends Walker { * @param int $depth Depth of comment. * @param array $args Uses 'style' argument for type of HTML list. */ - function start_lvl( &$output, $depth = 0, $args = array() ) { + public function start_lvl( &$output, $depth = 0, $args = array() ) { $GLOBALS['comment_depth'] = $depth + 1; switch ( $args['style'] ) { @@ -1584,8 +1686,8 @@ class Walker_Comment extends Walker { case 'ol': $output .= '
    ' . "\n"; break; - default: case 'ul': + default: $output .= '
\n"; break; - default: case 'ul': + default: $output .= "\n"; break; } @@ -1650,7 +1752,7 @@ class Walker_Comment extends Walker { * @param string $output Passed by reference. Used to append additional content. * @return null Null on failure with no changes to parameters. */ - function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) { + public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) { if ( !$element ) return; @@ -1684,7 +1786,7 @@ class Walker_Comment extends Walker { * @param int $depth Depth of comment in reference to parents. * @param array $args An array of arguments. */ - function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) { + public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) { $depth++; $GLOBALS['comment_depth'] = $depth; $GLOBALS['comment'] = $comment; @@ -1724,7 +1826,7 @@ class Walker_Comment extends Walker { * @param int $depth Depth of comment. * @param array $args An array of arguments. */ - function end_el( &$output, $comment, $depth = 0, $args = array() ) { + public function end_el( &$output, $comment, $depth = 0, $args = array() ) { if ( !empty( $args['end-callback'] ) ) { ob_start(); call_user_func( $args['end-callback'], $comment, $args, $depth ); @@ -1780,7 +1882,7 @@ class Walker_Comment extends Walker { $add_below = 'div-comment'; } ?> - < id="comment-"> + < has_children ? 'parent' : '' ); ?> id="comment-">
@@ -1802,9 +1904,16 @@ class Walker_Comment extends Walker { $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> -
- $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> -
+ $add_below, + 'depth' => $depth, + 'max_depth' => $args['max_depth'], + 'before' => '
', + 'after' => '
' + ) ) ); + ?> +
@@ -1826,7 +1935,7 @@ class Walker_Comment extends Walker { protected function html5_comment( $comment, $depth, $args ) { $tag = ( 'div' === $args['style'] ) ? 'div' : 'li'; ?> - < id="comment-" > + < id="comment-" has_children ? 'parent' : '' ); ?>>
paged_walk($_comments, $max_depth, $page, $per_page, $r); + $output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r ); $wp_query->max_num_comment_pages = $walker->max_pages; $in_comment_loop = false; - if ( $r['echo'] ) + if ( $r['echo'] ) { echo $output; - else + } else { return $output; + } } /** @@ -2017,13 +2145,15 @@ function wp_list_comments( $args = array(), $comments = null ) { * } * @type string $comment_field The comment textarea field HTML. * @type string $must_log_in HTML element for a 'must be logged in to comment' message. - * @type string $logged_in_as HTML element for a 'logged in as ' message. + * @type string $logged_in_as HTML element for a 'logged in as [user]' message. * @type string $comment_notes_before HTML element for a message displayed before the comment form. * Default 'Your email address will not be published.'. * @type string $comment_notes_after HTML element for a message displayed after the comment form. * Default 'You may use these HTML tags and attributes ...'. * @type string $id_form The comment form element id attribute. Default 'commentform'. * @type string $id_submit The comment submit element id attribute. Default 'submit'. + * @type string $class_submit The comment submit element class attribute. Default 'submit'. + * @type string $name_submit The comment submit element name attribute. Default 'submit'. * @type string $title_reply The translatable 'reply' button label. Default 'Leave a Reply'. * @type string $title_reply_to The translatable 'reply-to' button label. Default 'Leave a Reply to %s', * where %s is the author of the comment being replied to. @@ -2036,8 +2166,6 @@ function wp_list_comments( $args = array(), $comments = null ) { function comment_form( $args = array(), $post_id = null ) { if ( null === $post_id ) $post_id = get_the_ID(); - else - $id = $post_id; $commenter = wp_get_current_commenter(); $user = wp_get_current_user(); @@ -2054,7 +2182,7 @@ function comment_form( $args = array(), $post_id = null ) { 'author' => '

' . ' ' . '

', 'email' => '

' . - '

', + '

', 'url' => '

' . '

', ); @@ -2071,15 +2199,17 @@ function comment_form( $args = array(), $post_id = null ) { $fields = apply_filters( 'comment_form_default_fields', $fields ); $defaults = array( 'fields' => $fields, - 'comment_field' => '

', + 'comment_field' => '

', /** This filter is documented in wp-includes/link-template.php */ 'must_log_in' => '

' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '

', /** This filter is documented in wp-includes/link-template.php */ 'logged_in_as' => '

' . sprintf( __( 'Logged in as %2$s. Log out?' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '

', - 'comment_notes_before' => '

' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '

', - 'comment_notes_after' => '

' . sprintf( __( 'You may use these HTML tags and attributes: %s' ), ' ' . allowed_tags() . '' ) . '

', + 'comment_notes_before' => '

' . __( 'Your email address will not be published.' ) . ''. ( $req ? $required_text : '' ) . '

', + 'comment_notes_after' => '

' . sprintf( __( 'You may use these HTML tags and attributes: %s' ), ' ' . allowed_tags() . '' ) . '

', 'id_form' => 'commentform', 'id_submit' => 'submit', + 'class_submit' => 'submit', + 'name_submit' => 'submit', 'title_reply' => __( 'Leave a Reply' ), 'title_reply_to' => __( 'Leave a Reply to %s' ), 'cancel_reply_link' => __( 'Cancel reply' ), @@ -2124,7 +2254,7 @@ function comment_form( $args = array(), $post_id = null ) {
> tag. + * Fires at the top of the comment form, inside the form tag. * * @since 3.0.0 */ @@ -2171,7 +2301,7 @@ function comment_form( $args = array(), $post_id = null ) { /** * Filter a comment form field for display. * - * The dynamic portion of the filter hook, $name, refers to the name + * The dynamic portion of the filter hook, `$name`, refers to the name * of the comment form field. Such as 'author', 'email', or 'url'. * * @since 3.0.0 @@ -2200,7 +2330,7 @@ function comment_form( $args = array(), $post_id = null ) { ?>

- +