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

Timestamp:

09/19/2012 12:43:31 PM (13 years ago)

Author:

ryan

Message:

Reduce reliance on global variables in the list tables. Allow passing a screen ID to the list tables so that ajax handlers can set the needed screen.

Props nacin
fixes #21871

File:

• trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (2 diffs)

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

@@ -13 +13 @@
     var $is_site_themes;
 
-    function __construct() {
+    function __construct( $args = array() ) {
         global $status, $page;
+
+        parent::__construct( array(
+            'plural' => 'themes',
+            'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+        ) );
 
         $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
@@ -22 +27 @@
         $page = $this->get_pagenum();
 
-        $screen = get_current_screen();
-        $this->is_site_themes = ( 'site-themes-network' == $screen->id ) ? true : false;
+        $this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
 
         if ( $this->is_site_themes )
             $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
-
-        parent::__construct( array(
-            'plural' => 'themes'
-        ) );
     }