Wordpress 3.5

[autoinstalls/wordpress.git] / wp-admin / includes / list-table.php

diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
index 716e80aca9b939b576abb349415283f4303f5672..071df0dcc56038631e85d175499687155d37c34a 100644 (file)
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -14,9 +14,10 @@
  * @since 3.1.0
  *
  * @param string $class The type of the list table, which is the class name.
  * @since 3.1.0
  *
  * @param string $class The type of the list table, which is the class name.

+ * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.

  * @return object|bool Object on success, false if the class does not exist.
  */
  * @return object|bool Object on success, false if the class does not exist.
  */

-function _get_list_table( $class ) {
+function _get_list_table( $class, $args = array() ) {

        $core_classes = array(
                //Site Admin
                'WP_Posts_List_Table' => 'posts',
        $core_classes = array(
                //Site Admin
                'WP_Posts_List_Table' => 'posts',


@@ -28,7 +29,7 @@ function _get_list_table( $class ) {
                'WP_Links_List_Table' => 'links',
                'WP_Plugin_Install_List_Table' => 'plugin-install',
                'WP_Themes_List_Table' => 'themes',
                'WP_Links_List_Table' => 'links',
                'WP_Plugin_Install_List_Table' => 'plugin-install',
                'WP_Themes_List_Table' => 'themes',

-               'WP_Theme_Install_List_Table' => 'theme-install',
+               'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),

                'WP_Plugins_List_Table' => 'plugins',
                // Network Admin
                'WP_MS_Sites_List_Table' => 'ms-sites',
                'WP_Plugins_List_Table' => 'plugins',
                // Network Admin
                'WP_MS_Sites_List_Table' => 'ms-sites',


@@ -37,8 +38,17 @@ function _get_list_table( $class ) {
        );
 
        if ( isset( $core_classes[ $class ] ) ) {
        );
 
        if ( isset( $core_classes[ $class ] ) ) {

-               require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $core_classes[ $class ] . '-list-table.php' );
-               return new $class;
+               foreach ( (array) $core_classes[ $class ] as $required )
+                       require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+
+               if ( isset( $args['screen'] ) )
+                       $args['screen'] = convert_to_screen( $args['screen'] );
+               elseif ( isset( $GLOBALS['hook_suffix'] ) )
+                       $args['screen'] = get_current_screen();
+               else
+                       $args['screen'] = null;
+
+               return new $class( $args );

        }
 
        return false;
        }
 
        return false;


@@ -101,4 +111,3 @@ class _WP_List_Table_Compat extends WP_List_Table {
                return $this->_columns;
        }
 }
                return $this->_columns;
        }
 }

-?>
\ No newline at end of file