Wordpress 2.8

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

diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index dde4a3059f77973b49ce5344e4dac36fa6caa6d7..452aee1e6df3113a895bb74b881cece1c9252f7a 100644 (file)
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -18,21 +18,19 @@ $title = __('Install Plugins');
 $parent_file = 'plugins.php';
 
 wp_reset_vars( array('tab', 'paged') );
-wp_enqueue_style( 'plugin-install' );
-wp_enqueue_script( 'plugin-install' );
-add_thickbox();
 
 //These are the tabs which are shown on the page,
 $tabs = array();
-$tabs['dashboard'] = __('Start Page'); //TODO: Better name?
+$tabs['dashboard'] = __('Search');
 if ( 'search' == $tab )
        $tabs['search'] = __('Search Results');
+$tabs['upload'] = __('Upload');
 $tabs['featured'] = __('Featured');
 $tabs['popular']  = __('Popular');
 $tabs['new']      = __('Newest');
 $tabs['updated']  = __('Recently Updated');
 
-$nonmenu_tabs = array('install', 'plugin-information', 'upload'); //Valid actions to perform which do not have a Menu item.
+$nonmenu_tabs = array('plugin-information'); //Valid actions to perform which do not have a Menu item.
 
 $tabs = apply_filters('install_plugins_tabs', $tabs );
 $nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
@@ -45,6 +43,11 @@ if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_
 if( empty($paged) )
        $paged = 1;
 
+wp_enqueue_style( 'plugin-install' );
+wp_enqueue_script( 'plugin-install' );
+if ( 'plugin-information' != $tab )
+       add_thickbox();
+
 $body_id = $tab;
 
 do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
@@ -53,7 +56,7 @@ include('admin-header.php');
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); ?></h2>
 
        <ul class="subsubsub">
 <?php
@@ -61,7 +64,7 @@ $display_tabs = array();
 foreach ( (array)$tabs as $action => $text ) {
        $sep = ( end($tabs) != $text ) ? ' | ' : '';
        $class = ( $action == $tab ) ? ' class="current"' : '';
-       $href = admin_url('plugin-install.php?tab='. $action);
+       $href = admin_url('plugin-install.php?tab=' . $action);
        echo "\t\t<li><a href='$href'$class>$text</a>$sep</li>\n";
 }
 ?>
@@ -71,4 +74,3 @@ foreach ( (array)$tabs as $action => $text ) {
 </div>
 <?php
 include('admin-footer.php');
-?>