golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2012-03-03 02:40:43 +00:00
parent 46daef9849
commit e251ff1c04
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/class-wp-list-table.php
View File

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

13
wp-admin/includes/class-wp-themes-list-table.php
View File

@ -125,12 +125,12 @@ class WP_Themes_List_Table extends WP_List_Table {
$title = $theme->display('Name');
$version = $theme->display('Version');
$author = $theme->display('Author');
$activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;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="'
. esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
@ -140,9 +140,9 @@ class WP_Themes_List_Table extends WP_List_Table {
$actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet )
. '" 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 );
?>
<a href="<?php echo $preview_link; ?>" class="thickbox thickbox-preview screenshot">
@ -153,7 +153,7 @@ class WP_Themes_List_Table extends WP_List_Table {
<h3><?php
/* 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>
<div class="themedetaildiv hide-if-js">
@ -227,6 +227,7 @@ class WP_Themes_List_Table extends WP_List_Table {
if ( is_array( $extra_args ) )
$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();
}
}