From 842d059bd15fa404b411530e1f353dcbea01c8a8 Mon Sep 17 00:00:00 2001 From: Pete Mall Date: Wed, 24 Nov 2010 00:27:54 +0000 Subject: [PATCH] Site Themes cleanup. See #14897. git-svn-id: https://develop.svn.wordpress.org/trunk@16559 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/class-wp-ms-themes-list-table.php | 8 +++----- wp-admin/network/site-themes.php | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) 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 8741569625..6bc5215625 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -25,12 +25,10 @@ class WP_MS_Themes_List_Table extends WP_List_Table { $page = $this->get_pagenum(); - if ( !isset($this->is_site_themes) ) { - $screen = get_current_screen(); - $this->is_site_themes = ( 'site-themes-network' == $screen->id ) ? true : false; - } + $screen = get_current_screen(); + $this->is_site_themes = ( 'site-themes-network' == $screen->id ) ? true : false; - if ( $this->is_site_themes && ! isset( $this->site_id ) ) + if ( $this->is_site_themes ) $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; parent::WP_List_Table( array( diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 724f181433..bb5e725bcb 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -28,8 +28,6 @@ $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(); $details = get_blog_details( $id );