From 8b60cbd2db25324b280771319e96b06dbdbc90e3 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 23 Nov 2010 22:27:05 +0000 Subject: [PATCH] Set blog id for site-themes.php AJAX requests. git-svn-id: http://svn.automattic.com/wordpress/trunk@16556 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-themes-list-table.php | 3 +++ wp-admin/network/site-themes.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index ec61c8ddc5..8741569625 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -30,6 +30,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table { $this->is_site_themes = ( 'site-themes-network' == $screen->id ) ? true : false; } + if ( $this->is_site_themes && ! isset( $this->site_id ) ) + $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; + parent::WP_List_Table( array( 'plural' => 'plugins', // @todo replace with themes and add css ) ); diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 107f03e687..724f181433 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -27,7 +27,7 @@ $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; if ( ! $id ) wp_die( __('Invalid site ID.') ); - + $wp_list_table->site_id = $id; $wp_list_table->is_site_themes = true; $wp_list_table->prepare_items();