Changeset 16182

Timestamp:

11/04/2010 03:00:55 PM (14 years ago)

Author:

scribu

Message:

Default to get_current_screen() in list table classes. See #14579

Location:

trunk/wp-admin/includes

Files:

• class-wp-comments-list-table.php (modified) (1 diff)
• class-wp-links-list-table.php (modified) (1 diff)
• class-wp-list-table.php (modified) (3 diffs)
• class-wp-ms-sites-list-table.php (modified) (1 diff)
• class-wp-ms-themes-list-table.php (modified) (1 diff)
• class-wp-ms-users-list-table.php (modified) (1 diff)
• class-wp-plugin-install-list-table.php (modified) (1 diff)
• class-wp-plugins-list-table.php (modified) (1 diff)
• class-wp-posts-list-table.php (modified) (2 diffs)
• class-wp-terms-list-table.php (modified) (2 diffs)
• class-wp-theme-install-list-table.php (modified) (1 diff)
• class-wp-themes-list-table.php (modified) (1 diff)
• class-wp-users-list-table.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-comments-list-table.php

@@ -31 +31 @@
 
         parent::WP_List_Table( array(
-            'screen' => 'edit-comments',
             'plural' => 'comments'
         ) );

trunk/wp-admin/includes/class-wp-links-list-table.php

@@ -11 +11 @@
     function WP_Links_List_Table() {
         parent::WP_List_Table( array(
-            'screen' => 'link-manager',
             'plural' => 'bookmarks',
         ) );

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

@@ -77 +77 @@
      * @access protected
      */
-    function WP_List_Table( $args ) {
+    function WP_List_Table( $args = array() ) {
         $args = wp_parse_args( $args, array(
-            'screen' => '',
+            'screen' => get_current_screen(),
             'plural' => '',
             'singular' => '',
@@ -633 +633 @@
      */
     function get_table_classes() {
-        extract( $this->_args );
-
-        return array( 'widefat', 'fixed', $plural );
+        return array( 'widefat', 'fixed', $this->_args['plural'] );
     }
 
@@ -808 +806 @@
      */
     function _js_vars() {
-        extract( $this->_args );
-
-        $class = get_class( $this );
-
-        printf( "<script type='text/javascript'>list_args = %s;</script>\n",
-            json_encode( compact( 'screen', 'class' ) )
+        $args = array(
+            'class' => get_class( $this ),
+            'screen' => $this->_screen
         );
+
+        printf( "<script type='text/javascript'>list_args = %s;</script>\n", json_encode( $args ) );
     }
 }

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

@@ -11 +11 @@
     function WP_MS_Sites_List_Table() {
         parent::WP_List_Table( array(
-            'screen' => 'sites-network',
             'plural' => 'sites',
         ) );

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

@@ -24 +24 @@
 
         parent::WP_List_Table( array(
-            'screen' => 'themes',
             'plural' => 'plugins', // @todo replace with themes and add css
         ) );

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

@@ -11 +11 @@
     function WP_MS_Users_List_Table() {
         parent::WP_List_Table( array(
-            'screen' => 'users-network',
+            'plural' => 'users'
         ) );
     }

trunk/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -8 +8 @@
  */
 class WP_Plugin_Install_List_Table extends WP_List_Table {
-
-    function WP_Plugin_Install_List_Table() {
-        parent::WP_List_Table( array(
-            'screen' => 'plugin-install',
-        ) );
-    }
 
     function check_permissions() {

trunk/wp-admin/includes/class-wp-plugins-list-table.php

@@ -24 +24 @@
 
         parent::WP_List_Table( array(
-            'screen' => 'plugins',
             'plural' => 'plugins',
         ) );

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -46 +46 @@
 
     function WP_Posts_List_Table() {
-        global $post_type_object, $post_type, $current_screen, $wpdb;
+        global $post_type_object, $post_type, $wpdb;
 
         if ( !isset( $_REQUEST['post_type'] ) )
@@ -75 +75 @@
 
         parent::WP_List_Table( array(
-            'screen' => $current_screen,
             'plural' => 'posts',
         ) );

trunk/wp-admin/includes/class-wp-terms-list-table.php

@@ -12 +12 @@
 
     function WP_Terms_List_Table() {
-        global $post_type, $taxonomy, $tax, $current_screen;
+        global $post_type, $taxonomy, $tax;
 
         wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) );
@@ -27 +27 @@
             $post_type = 'post';
 
-        if ( !isset( $current_screen ) )
-            set_current_screen( 'edit-' . $taxonomy );
-
         parent::WP_List_Table( array(
-            'screen' => $current_screen,
             'plural' => 'tags',
             'singular' => 'tag',

trunk/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -8 +8 @@
  */
 class WP_Theme_Install_List_Table extends WP_List_Table {
-
-    function WP_Theme_Install_List_Table() {
-        parent::WP_List_Table( array(
-            'screen' => 'theme-install',
-        ) );
-    }
 
     function check_permissions() {

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

@@ -11 +11 @@
     var $search = array();
     var $features = array();
-
-    function WP_Themes_List_Table() {
-        parent::__construct( array(
-            'screen' => 'themes',
-        ) );
-    }
 
     function check_permissions() {

trunk/wp-admin/includes/class-wp-users-list-table.php

@@ -8 +8 @@
  */
 class WP_Users_List_Table extends WP_List_Table {
-
-    function WP_Users_List_Table() {
-        parent::WP_List_Table( array(
-            'screen' => 'users',
-            'plural' => 'users'
-        ) );
-    }
 
     function check_permissions() {

trunk/wp-admin/includes/deprecated.php

@@ -732 +732 @@
     var $_columns = array();
 
-    function _WP_List_Table_Compat( $screen) {
+    function _WP_List_Table_Compat( $screen ) {
         parent::WP_List_Table( array(
             'screen' => $screen,