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

Timestamp:

05/15/2014 06:42:19 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate the use of extract() in wp_list_comments(). All unit tests pass.

See #22400.

File:

• trunk/src/wp-includes/comment-template.php (modified) (1 diff)

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

@@ -1985 +1985 @@
                 $r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
 
-        extract( $r, EXTR_SKIP );
-
-        if ( empty($walker) )
+        if ( empty( $r['walker'] ) ) {
                 $walker = new Walker_Comment;
-
-        $output = $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
+        } else {
+                $walker = $r['walker'];
+        }
+
+        $output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
         $wp_query->max_num_comment_pages = $walker->max_pages;
 
         $in_comment_loop = false;
 
-        if ( $r['echo'] )
+        if ( $r['echo'] ) {
                 echo $output;
-        else
+        } else {
                 return $output;
+        }
 }