Index: wp-includes/comment-template.php =================================================================== --- wp-includes/comment-template.php (revision 31035) +++ wp-includes/comment-template.php (working copy) @@ -175,10 +175,10 @@ */ $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment ); if ((!empty($email)) && ($email != '@')) { - $display = ($linktext != '') ? $linktext : $email; + $display = ($linktext != '') ? $linktext : $email; $return = $before; $return .= "$display"; - $return .= $after; + $return .= $after; return $return; } else { return ''; @@ -1542,8 +1542,11 @@ $text = __('Click here to cancel reply.'); $style = isset($_GET['replytocom']) ? '' : ' style="display:none;"'; - $link = esc_html( remove_query_arg('replytocom') ) . '#respond'; + $reply_id = get_comment_container_id( true ); + + $link = esc_html( remove_query_arg('replytocom') ) . $reply_id; + $formatted_link = '' . $text . ''; /** * Filter the cancel comment reply link HTML. @@ -1853,12 +1856,12 @@ */ protected function ping( $comment, $depth, $args ) { $tag = ( 'div' == $args['style'] ) ? 'div' : 'li'; -?> + ?> < id="comment-" > -
+ + +
+ tag. + * + * @since 1.5.0 + * + * @param int $post_id The post ID. + */ + do_action( 'comment_form', $post_id ); + ?> + + +