Changeset 20104

Timestamp:

03/03/2012 02:40:43 AM (13 years ago)

Author:

koopersmith

Message:

Partially revert [20100]. The list_args JS variable cannot be extended due to its use as an argument in fetch-list. see #19815.

We should reattempt extending the args created in WP_List_Table, but will need to deprecate the current list_args to do so.

Also, infinite scroll on themes pages is no longer broken. Go team.

Location:

trunk/wp-admin/includes

Files:

• class-wp-list-table.php (modified) (2 diffs)
• class-wp-themes-list-table.php (modified) (4 diffs)

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

@@ -904 +904 @@
      * @access private
      */
-    function _js_vars( $extra_args = array() ) {
+    function _js_vars() {
         $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-themes-list-table.php

@@ -126 +126 @@
             $version = $theme->display('Version');
             $author = $theme->display('Author');
- 
+
             $activate_link = wp_nonce_url( "themes.php?action=activate&template=" . urlencode( $template ) . "&stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $template );
             $preview_link = esc_url( add_query_arg(
                 array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => true, 'TB_iframe' => 'true' ),
                 home_url( '/' ) ) );
- 
+
             $actions = array();
             $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="'
@@ -141 +141 @@
                     . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
                     . "' );" . '">' . __( 'Delete' ) . '</a>';
- 
+
             $actions = apply_filters( 'theme_action_links', $actions, $theme );
- 
+
             $actions = implode ( ' | ', $actions );
             ?>
@@ -154 +154 @@
             /* translators: 1: theme title, 2: theme version, 3: theme author */
             printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
- 
+
             <span class='action-links'><?php echo $actions ?></span>
             <span class="separator hide-if-no-js">| </span><a href="#" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
@@ -228 +228 @@
             $args = array_merge( $args, $extra_args );
 
-        parent::_js_vars( $args );
+        printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", json_encode( $args ) );
+        parent::_js_vars();
     }
 }