WordPress.org

Make WordPress Core

Changeset 33042


Ignore:
Timestamp:
07/02/2015 12:46:28 AM (5 years ago)
Author:
markjaquith
Message:

Revert [33038] because of objections raised on #22889 and #31590

Location:
trunk/src/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/comment-template.php

    r33039 r33042  
    14391439
    14401440        $link = sprintf( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
    1441             esc_url( get_permalink( $post->ID ) ) . "#" . $args['respond_id'],
     1441            esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
    14421442            $onclick,
    14431443            esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
     
    15721572        $text = __('Click here to cancel reply.');
    15731573
    1574     $link = '#respond';
    1575 
    1576     $formatted_link = '<a id="cancel-comment-reply-link" href="' . $link . '">' . $text . '</a>';
     1574    $style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
     1575    $link = esc_html( remove_query_arg('replytocom') ) . '#respond';
     1576
     1577    $formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
    15771578    /**
    15781579     * Filter the cancel comment reply link HTML.
     
    16101611        $id = get_the_ID();
    16111612
     1613    $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
    16121614    $result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
    1613     $result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='0' />\n";
     1615    $result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
    16141616
    16151617    /**
     
    16181620     * @since 3.0.0
    16191621     *
    1620      * @param string $result     The HTML-formatted hidden id field comment elements.
    1621      * @param int    $id         The post ID.
    1622      * @param int    $deprecated No longer used.
    1623      */
    1624     return apply_filters( 'comment_id_fields', $result, $id, 0 );
     1622     * @param string $result    The HTML-formatted hidden id field comment elements.
     1623     * @param int    $id        The post ID.
     1624     * @param int    $replytoid The id of the comment being replied to.
     1625     */
     1626    return apply_filters( 'comment_id_fields', $result, $id, $replytoid );
    16251627}
    16261628
     
    16471649 * @param string $noreplytext  Optional. Text to display when not replying to a comment.
    16481650 *                             Default false.
    1649  * @param string $deprecated   No longer used.
    1650  * @param string $deprecated_2 No longer used.
    1651  */
    1652 function comment_form_title( $noreplytext = false, $deprecated = null, $deprecated_2 = null ) {
    1653     if ( ! is_null( $deprecated ) )
    1654         _deprecated_argument( __FUNCTION__, '4.3' );
    1655     if ( ! is_null( $deprecated_2 ) )
    1656         _deprecated_argument( __FUNCTION__, '4.3' );
     1651 * @param string $replytext    Optional. Text to display when replying to a comment.
     1652 *                             Default false. Accepts "%s" for the author of the comment
     1653 *                             being replied to.
     1654 * @param string $linktoparent Optional. Boolean to control making the author's name a link
     1655 *                             to their comment. Default true.
     1656 */
     1657function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
     1658    global $comment;
    16571659
    16581660    if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
    1659 
    1660     echo $noreplytext;
     1661    if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
     1662
     1663    $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
     1664
     1665    if ( 0 == $replytoid )
     1666        echo $noreplytext;
     1667    else {
     1668        $comment = get_comment($replytoid);
     1669        $author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
     1670        printf( $replytext, $author );
     1671    }
    16611672}
    16621673
     
    22842295            ?>
    22852296            <div id="respond" class="comment-respond">
    2286                 <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>
     2297                <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>
    22872298                <?php if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
    22882299                    <?php echo $args['must_log_in']; ?>
  • trunk/src/wp-includes/default-filters.php

    r33038 r33042  
    231231add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
    232232add_action( 'wp_print_styles',     'print_emoji_styles'                     );
     233
     234if ( isset( $_GET['replytocom'] ) )
     235    add_action( 'wp_head', 'wp_no_robots' );
    233236
    234237// Login actions
  • trunk/src/wp-includes/theme-compat/comments.php

    r33038 r33042  
    6666<div id="respond">
    6767
    68 <h3><?php _e('Leave a Reply'); ?></h3>
     68<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
    6969
    7070<div id="cancel-comment-reply">
Note: See TracChangeset for help on using the changeset viewer.