diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-admin/includes/theme-install.php --- a/wp/wp-admin/includes/theme-install.php Mon Jun 08 16:11:51 2015 +0000 +++ b/wp/wp-admin/includes/theme-install.php Tue Jun 09 03:35:32 2015 +0200 @@ -57,7 +57,7 @@ if ( ! $type_selector ) echo '

' . __( 'Search for themes by keyword.' ) . '

'; ?> -
+ @@ -99,7 +99,7 @@

- + -

@@ -145,7 +144,7 @@
prepare_items(); $wp_list_table->single_row( $theme ); } @@ -166,12 +169,17 @@ function display_themes() { global $wp_list_table; + if ( ! isset( $wp_list_table ) ) { + $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); + } + $wp_list_table->prepare_items(); $wp_list_table->display(); + } -add_action('install_themes_search', 'display_themes'); -add_action('install_themes_featured', 'display_themes'); -add_action('install_themes_new', 'display_themes'); -add_action('install_themes_updated', 'display_themes'); +// add_action('install_themes_search', 'display_themes'); +// add_action('install_themes_featured', 'display_themes'); +// add_action('install_themes_new', 'display_themes'); +// add_action('install_themes_updated', 'display_themes'); /** * Display theme information in dialog box form. @@ -179,7 +187,7 @@ * @since 2.8.0 */ function install_theme_information() { - global $tab, $themes_allowedtags, $wp_list_table; + global $wp_list_table; $theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) ); @@ -187,6 +195,9 @@ wp_die( $theme ); iframe_header( __('Theme Install') ); + if ( ! isset( $wp_list_table ) ) { + $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); + } $wp_list_table->theme_installer_single( $theme ); iframe_footer(); exit;