Changeset 28389

Timestamp:

05/13/2014 05:26:34 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in WP_List_Table::pagination():

• Set variables instead of extracting $this->_pagination_args
• Weird: $infinite_scroll is only presently set in subclasses of WP_List_Table and never initialized otherwise.

See #22400.

File:

• trunk/src/wp-admin/includes/class-wp-list-table.php (modified) (5 diffs)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -518 +518 @@
          */
         function pagination( $which ) {
-                if ( empty( $this->_pagination_args ) )
+                if ( empty( $this->_pagination_args ) ) {
                         return;
-
-                extract( $this->_pagination_args, EXTR_SKIP );
+                }
+
+                $total_items = $this->_pagination_args['total_items'];
+                $total_pages = $this->_pagination_args['total_pages'];
+                $infinite_scroll = false;
+                if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+                        $infinite_scroll = $this->_pagination_args['infinite_scroll'];
+                }
 
                 $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
@@ -534 +540 @@
 
                 $disable_first = $disable_last = '';
-                if ( $current == 1 )
+                if ( $current == 1 ) {
                         $disable_first = ' disabled';
-                if ( $current == $total_pages )
+                }
+                if ( $current == $total_pages ) {
                         $disable_last = ' disabled';
-
+                }
                 $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
                         'first-page' . $disable_first,
@@ -553 +560 @@
                 );
 
-                if ( 'bottom' == $which )
+                if ( 'bottom' == $which ) {
                         $html_current_page = $current;
-                else
+                } else {
                         $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
                                 esc_attr__( 'Current page' ),
@@ -561 +568 @@
                                 strlen( $total_pages )
                         );
-
+                }
                 $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
                 $page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
@@ -580 +587 @@
 
                 $pagination_links_class = 'pagination-links';
-                if ( ! empty( $infinite_scroll ) )
+                if ( ! empty( $infinite_scroll ) ) {
                         $pagination_links_class = ' hide-if-js';
+                }
                 $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
 
-                if ( $total_pages )
+                if ( $total_pages ) {
                         $page_class = $total_pages < 2 ? ' one-page' : '';
-                else
+                } else {
                         $page_class = ' no-pages';
-
+                }
                 $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";