Ticket #22889: 22889.2.patch

src/wp-includes/comment-template.php

@@ -1438 +1438 @@
                 );
 
                 $link = sprintf( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-                        esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
+                        esc_url( get_permalink( $post->ID ) ) . "#" . $args['respond_id'],
                         $onclick,
                         esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
                         $args['reply_text']
@@ -1571 +1571 @@
         if ( empty($text) )
                 $text = __('Click here to cancel reply.');
 
-        $style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-        $link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+        $link = '#respond';
 
-        $formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
+        $formatted_link = '<a id="cancel-comment-reply-link" href="' . $link . '">' . $text . '</a>';
         /**
          * Filter the cancel comment reply link HTML.
          *
@@ -1610 +1609 @@
         if ( empty( $id ) )
                 $id = get_the_ID();
 
-        $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
         $result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
-        $result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
+        $result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='0' />\n";
 
         /**
          * Filter the returned comment id fields.
          *
          * @since 3.0.0
          *
-         * @param string $result    The HTML-formatted hidden id field comment elements.
-         * @param int    $id        The post ID.
-         * @param int    $replytoid The id of the comment being replied to.
+         * @param string $result     The HTML-formatted hidden id field comment elements.
+         * @param int    $id         The post ID.
+         * @param int    $deprecated No longer used.
          */
-        return apply_filters( 'comment_id_fields', $result, $id, $replytoid );
+        return apply_filters( 'comment_id_fields', $result, $id, 0 );
 }
 
 /**
@@ -1648 +1646 @@
  *
  * @param string $noreplytext  Optional. Text to display when not replying to a comment.
  *                             Default false.
- * @param string $replytext    Optional. Text to display when replying to a comment.
- *                             Default false. Accepts "%s" for the author of the comment
- *                             being replied to.
- * @param string $linktoparent Optional. Boolean to control making the author's name a link
- *                             to their comment. Default true.
+ * @param string $deprecated   No longer used.
+ * @param string $deprecated_2 No longer used.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
-        global $comment;
+function comment_form_title( $noreplytext, $deprecated = null, $deprecated_2 = null ) {
+        if ( ! is_null( $deprecated ) )
+                _deprecated_argument( __FUNCTION__, '4.3' );
+        if ( ! is_null( $deprecated_2 ) )
+                _deprecated_argument( __FUNCTION__, '4.3' );
 
         if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-        if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
-
-        $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-        if ( 0 == $replytoid )
-                echo $noreplytext;
-        else {
-                $comment = get_comment($replytoid);
-                $author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
-                printf( $replytext, $author );
-        }
+        echo $noreplytext;
 }
 
 /**
@@ -2294 +2283 @@
                         do_action( 'comment_form_before' );
                         ?>
                         <div id="respond" class="comment-respond">
-                                <h3 id="reply-title" class="comment-reply-title"><?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?> <small><?php cancel_comment_reply_link( $args['cancel_reply_link'] ); ?></small></h3>
+                                <h3 id="reply-title" class="comment-reply-title"><?php comment_form_title( $args['title_reply'] ); ?> <small><?php cancel_comment_reply_link( $args['cancel_reply_link'] ); ?></small></h3>
                                 <?php if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
                                         <?php echo $args['must_log_in']; ?>
                                         <?php

src/wp-includes/default-filters.php

@@ -231 +231 @@
 add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
 add_action( 'wp_print_styles',     'print_emoji_styles'                     );
 
-if ( isset( $_GET['replytocom'] ) )
-    add_action( 'wp_head', 'wp_no_robots' );
-
 // Login actions
 add_action( 'login_head',          'wp_print_head_scripts',         9     );
 add_action( 'login_footer',        'wp_print_footer_scripts',       20    );

src/wp-includes/theme-compat/comments.php

@@ -65 +65 @@
 
 <div id="respond">
 
-<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
+<h3><?php _e('Leave a Reply'); ?></h3>
 
 <div id="cancel-comment-reply">
         <small><?php cancel_comment_reply_link() ?></small>