Changeset 29823 for trunk/src/wp-includes/comment-template.php

Timestamp:

10/02/2014 08:44:34 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Make link construction in get_comment_reply_link() and get_post_reply_link() more readable.

see #16433.

File:

• trunk/src/wp-includes/comment-template.php (modified) (4 diffs)

trunk/src/wp-includes/comment-template.php

@@ -1322 +1322 @@
         }
 
-        $add_below = $args['add_below'];
-        $respond_id = $args['respond_id'];
-        $reply_text = $args['reply_text'];
-
         $comment = get_comment( $comment );
+
         if ( empty( $post ) ) {
                 $post = $comment->comment_post_ID;
         }
+
         $post = get_post( $post );
 
@@ -1337 +1335 @@
 
         if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-                $link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $args['login_text'] . '</a>';
+                $link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+                        esc_url( wp_login_url( get_permalink() ) ),
+                        $args['login_text']
+                );
         } else {
-                $link = "<a class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")' aria-label='" . esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ) . "'>$reply_text</a>";
+                $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( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+                        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']
+                );
         }
         /**
@@ -1405 +1415 @@
 
         $args = wp_parse_args($args, $defaults);
-        $add_below = $args['add_below'];
-        $respond_id = $args['respond_id'];
-        $reply_text = $args['reply_text'];
+
         $post = get_post($post);
 
@@ -1415 +1423 @@
 
         if ( get_option('comment_registration') && ! is_user_logged_in() ) {
-                $link = '<a rel="nofollow" href="' . wp_login_url( get_permalink() ) . '">' . $args['login_text'] . '</a>';
+                $link = sprintf( '<a rel="nofollow" href="%s">%s</a>',
+                        wp_login_url( get_permalink() ),
+                        $args['login_text']
+                );
         } else {
-                $link = "<a rel='nofollow' class='comment-reply-link' href='" . get_permalink($post->ID) . "#$respond_id' onclick='return addComment.moveForm(\"$add_below-$post->ID\", \"0\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+                $onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+                        $args['add_below'], $post->ID, $args['respond_id']
+                );
+
+                $link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+                        get_permalink( $post->ID ) . '#' . $args['respond_id'],
+                        $onclick,
+                        $args['reply_text']
+                );
         }
         $formatted_link = $args['before'] . $link . $args['after'];