Changeset 20100

Timestamp:

03/02/2012 11:06:31 PM (13 years ago)

Author:

nacin

Message:

Allow WP_List_Table::_js_vars() to take an array of additional args to add. Allows us to have a single variable printing data when child classes need more data. Also, fix compact() call in [20094]. see #19815.

Location:

trunk/wp-admin/includes

Files:

• class-wp-list-table.php (modified) (2 diffs)
• class-wp-theme-install-list-table.php (modified) (1 diff)
• class-wp-themes-list-table.php (modified) (1 diff)

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

@@ -904 +904 @@
      * @access private
      */
-    function _js_vars() {
+    function _js_vars( $extra_args = array() ) {
         $current_screen = get_current_screen();
 
@@ -915 +915 @@
         );
 
+        if ( is_array( $extra_args ) )
+            $args = array_merge( $args, $extra_args );
+
         printf( "<script type='text/javascript'>list_args = %s;</script>\n", json_encode( $args ) );
     }

trunk/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -171 +171 @@
      */
     function _js_vars() {
-        global $tab, $type;
-        parent::_js_vars( compact( $tab, $type ) );
+        global $tab, $type;     
+        parent::_js_vars( compact( 'tab', 'type' ) );
     }
 }

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

@@ -218 +218 @@
         $search_string = isset( $_REQUEST['s'] ) ? esc_attr( stripslashes( $_REQUEST['s'] ) ) : '';
 
-        $total_pages = 1;
-        if ( ! empty( $this->_pagination_args['total_pages'] ) )
-            $total_pages = $this->_pagination_args['total_pages'];
-
         $args = array(
             'search' => $search_string,
             'features' => $this->features,
             'paged' => $this->get_pagenum(),
-            'total_pages' => $total_pages,
+            'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
         );
 
         if ( is_array( $extra_args ) )
-        $args = array_merge( $args, $extra_args );
-
-        printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", json_encode( $args ) );
-        parent::_js_vars();
+            $args = array_merge( $args, $extra_args );
+
+        parent::_js_vars( $args );
     }
 }