Changeset 28401 for trunk/src/wp-includes/post-template.php

Timestamp:

05/15/2014 01:21:20 AM (10 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_list_pages() which, surprisingly, didn't even use any of the extracted variables.

See #22400.

File:

• trunk/src/wp-includes/post-template.php (modified) (6 diffs)

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

@@ -1002 +1002 @@
     $defaults = array(
         'depth' => 0, 'show_date' => '',
-        'date_format' => get_option('date_format'),
+        'date_format' => get_option( 'date_format' ),
         'child_of' => 0, 'exclude' => '',
-        'title_li' => __('Pages'), 'echo' => 1,
+        'title_li' => __( 'Pages' ), 'echo' => 1,
         'authors' => '', 'sort_column' => 'menu_order, post_title',
         'link_before' => '', 'link_after' => '', 'walker' => '',
@@ -1010 +1010 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
 
     $output = '';
@@ -1016 +1015 @@
 
     // sanitize, mostly to keep spaces out
-    $r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']);
+    $r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
 
     // Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
-    $exclude_array = ( $r['exclude'] ) ? explode(',', $r['exclude']) : array();
+    $exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
 
     /**
@@ -1032 +1031 @@
     // Query pages.
     $r['hierarchical'] = 0;
-    $pages = get_pages($r);
-
-    if ( !empty($pages) ) {
-        if ( $r['title_li'] )
+    $pages = get_pages( $r );
+
+    if ( ! empty( $pages ) ) {
+        if ( $r['title_li'] ) {
             $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
-
+        }
         global $wp_query;
         if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
@@ -1048 +1047 @@
         }
 
-        $output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
-
-        if ( $r['title_li'] )
+        $output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
+
+        if ( $r['title_li'] ) {
             $output .= '</ul></li>';
+        }
     }
 
@@ -1061 +1061 @@
      * @see wp_list_pages()
      *
-     * @param string $output HTML output of the pages list.
+     * @param string $html HTML output of the pages list.
      * @param array  $r      An array of page-listing arguments.
      */
-    $output = apply_filters( 'wp_list_pages', $output, $r );
-
-    if ( $r['echo'] )
-        echo $output;
-    else
-        return $output;
+    $html = apply_filters( 'wp_list_pages', $output, $r );
+
+    if ( $r['echo'] ) {
+        echo $html;
+    } else {
+        return $html;
+    }
 }