Changeset 28431

Timestamp:

05/15/2014 03:34:37 PM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in get_comment_reply_link().

See #22400.

File:

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

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

@@ -1292 +1292 @@
  * @return mixed 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(
@@ -1304 +1304 @@
         );
 
-        $args = wp_parse_args($args, $defaults);
-
-        if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] )
+        $args = wp_parse_args( $args, $defaults );
+
+        if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) {
                 return;
-
-        extract($args, EXTR_SKIP);
-
-        $comment = get_comment($comment);
-        if ( empty($post) )
+        }
+
+        $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);
-
-        if ( !comments_open($post->ID) )
+        }
+        $post = get_post( $post );
+
+        if ( ! comments_open( $post->ID ) ) {
                 return false;
-
-        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() ) ) . '">' . $login_text . '</a>';
-        else
+        }
+
+        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>';
+        } 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\")'>$reply_text</a>";
-
+        }
         /**
          * Filter the comment reply link.
@@ -1334 +1339 @@
          * @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 );
 }