Wordpress 3.1

[autoinstalls/wordpress.git] / wp-admin / theme-install.php

diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 8b954269fa958de83276737d36ffab433c05f572..263d9a9c0f87cce925f9e9f7aecbe7c54f4df561 100644 (file)
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -6,49 +6,40 @@
  * @subpackage Administration
  */
 
+if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
+       define( 'IFRAME_REQUEST', true );
+
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
 if ( ! current_user_can('install_themes') )
-       wp_die(__('You do not have sufficient permissions to install themes on this site.'));
+       wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+
+if ( is_multisite() && ! is_network_admin() ) {
+       wp_redirect( network_admin_url( 'theme-install.php' ) );
+       exit();
+}
 
-include(ABSPATH . 'wp-admin/includes/theme-install.php');
+$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table->prepare_items();
+$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+if ( $pagenum > $total_pages && $total_pages > 0 ) {
+       wp_redirect( add_query_arg( 'paged', $total_pages ) );
+       exit;
+}
 
 $title = __('Install Themes');
 $parent_file = 'themes.php';
-$submenu_file = 'themes.php';
+if ( !is_network_admin() )
+       $submenu_file = 'themes.php';
 
-wp_reset_vars( array('tab', 'paged') );
 wp_enqueue_style( 'theme-install' );
 wp_enqueue_script( 'theme-install' );
 
 add_thickbox();
 wp_enqueue_script( 'theme-preview' );
 
-//These are the tabs which are shown on the page,
-$tabs = array();
-$tabs['dashboard'] = __('Search');
-if ( 'search' == $tab )
-       $tabs['search'] = __('Search Results');
-$tabs['upload'] = __('Upload');
-$tabs['featured'] = _x('Featured','Theme Installer');
-//$tabs['popular']  = _x('Popular','Theme Installer');
-$tabs['new']      = _x('Newest','Theme Installer');
-$tabs['updated']  = _x('Recently Updated','Theme Installer');
-
-$nonmenu_tabs = array('theme-information'); //Valid actions to perform which do not have a Menu item.
-
-$tabs = apply_filters('install_themes_tabs', $tabs );
-$nonmenu_tabs = apply_filters('install_themes_nonmenu_tabs', $nonmenu_tabs);
-
-//If a non-valid menu tab has been selected, And its not a non-menu action.
-if ( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
-       $tab_actions = array_keys($tabs);
-       $tab = $tab_actions[0];
-}
-if ( empty($paged) )
-       $paged = 1;
-
 $body_id = $tab;
 
 do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
@@ -61,25 +52,25 @@ $help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes#Adding_New
 $help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
 add_contextual_help($current_screen, $help);
 
-include('./admin-header.php');
+include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
+<?php
+screen_icon();
+
+if ( is_network_admin() ) : ?>
+<h2><?php echo esc_html( $title ); ?></h2>
+<?php else : ?>
+<h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
 
-       <ul class="subsubsub">
 <?php
-$display_tabs = array();
-foreach ( (array)$tabs as $action => $text ) {
-       $sep = ( end($tabs) != $text ) ? ' | ' : '';
-       $class = ( $action == $tab ) ? ' class="current"' : '';
-       $href = admin_url('theme-install.php?tab='. $action);
-       echo "\t\t<li><a href='$href'$class>$text</a>$sep</li>\n";
-}
-?>
-       </ul>
-       <br class="clear" />
-       <?php do_action('install_themes_' . $tab, $paged); ?>
+endif;
+
+$wp_list_table->views(); ?>
+
+<br class="clear" />
+<?php do_action('install_themes_' . $tab, $paged); ?>
 </div>
 <?php
-include('./admin-footer.php');
+include(ABSPATH . 'wp-admin/admin-footer.php');
+