From b193b920bff4908684e54869a24543d27b0ecb64 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 25 Feb 2009 23:43:30 +0000
Subject: [PATCH] Upload theme from zip fixes. see #8652

git-svn-id: http://svn.automattic.com/wordpress/trunk@10650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/theme-install.php | 6 +++---
 wp-admin/theme-install.php          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index f953407568..d4fc8e1709 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -242,11 +242,11 @@ function install_themes_updated($page = 1) {
 }
 
 add_action('install_themes_upload', 'install_themes_upload', 10, 1);
-function install_themes_upload() {
+function install_themes_upload($page = 1) {
 ?>
 	<h4><?php _e('Install a theme in .zip format') ?></h4>
 	<p><?php _e('If you have a theme in a .zip format, You may install it by uploading it here.') ?></p>
-	<form method="post" enctype="multipart/form-data" action="<?php echo admin_url('theme-install.php?tab=upload') ?>">
+	<form method="post" enctype="multipart/form-data" action="<?php echo admin_url('theme-install.php?tab=do_upload') ?>">
 		<?php wp_nonce_field( 'theme-upload') ?>
 		<input type="file" name="themezip" />
 		<input type="submit" class="button" value="<?php _e('Install Now') ?>" />
@@ -520,7 +520,7 @@ function install_theme_information() {
 }
 
 
-add_action('install_themes_upload', 'upload_theme');
+add_action('install_themes_do_upload', 'upload_theme');
 function upload_theme() {
 
 	if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 518e45e6af..eeab3516b9 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -35,7 +35,7 @@ $tabs['featured'] = __('Featured');
 $tabs['new']      = __('Newest');
 $tabs['updated']  = __('Recently Updated');
 
-$nonmenu_tabs = array('install', 'theme-information', 'upload'); //Valid actions to perform which do not have a Menu item.
+$nonmenu_tabs = array('install', 'theme-information', 'do_upload'); //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);