Ticket #14897: 14897.17.diff

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

@@ -25 +25 @@
 
                 $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(

wp-admin/network/site-themes.php

@@ -28 +28 @@
 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 );