Changeset 16559

Timestamp:

11/24/2010 12:27:54 AM (14 years ago)

Author:

PeteMall

Message:

Site Themes cleanup. See #14897.

Location:

trunk/wp-admin

Files:

• includes/class-wp-ms-themes-list-table.php (modified) (1 diff)
• network/site-themes.php (modified) (1 diff)

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

@@ -26 +26 @@
         $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;
-        }
-
-        if ( $this->is_site_themes && ! isset( $this->site_id ) )
+        $screen = get_current_screen();
+        $this->is_site_themes = ( 'site-themes-network' == $screen->id ) ? true : false;
+
+        if ( $this->is_site_themes )
             $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 

trunk/wp-admin/network/site-themes.php

@@ -29 +29 @@
     wp_die( __('Invalid site ID.') );
 
-$wp_list_table->site_id = $id;
-$wp_list_table->is_site_themes = true;
 $wp_list_table->prepare_items();