WordPress 3.4

[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..2dff578e0db2bf85a5cf67471d6102fe85721dc0 100644 (file)
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -28,7 +28,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,7 +37,8 @@ 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' );
+               foreach ( (array) $core_classes[ $class ] as $required )
+                       require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );

                return new $class;
        }
 
                return new $class;
        }
 


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

-?>
\ No newline at end of file