Wordpress 3.5

[autoinstalls/wordpress.git] / wp-admin / update.php

diff --git a/wp-admin/update.php b/wp-admin/update.php
index e529064eed2ce5521b95cc9133674cf83624934c..687142e2187058e05e3d9671b581f97efbc21024 100644 (file)
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -90,7 +90,7 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'install-plugin' == $action ) {
 
                if ( ! current_user_can('install_plugins') )
-                       wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
 
                include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
 
@@ -121,7 +121,7 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'upload-plugin' == $action ) {
 
                if ( ! current_user_can('install_plugins') )
-                       wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
 
                check_admin_referer('plugin-upload');
 
@@ -134,11 +134,14 @@ if ( isset($_GET['action']) ) {
 
                $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
                $nonce = 'plugin-upload';
-               $url = add_query_arg(array('package' => $file_upload->filename ), 'update.php?action=upload-plugin');
+               $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
                $type = 'upload'; //Install plugin type, From Web or an Upload.
 
                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-               $upgrader->install( $file_upload->package );
+               $result = $upgrader->install( $file_upload->package );
+
+               if ( $result || is_wp_error($result) )
+                       $file_upload->cleanup();
 
                include(ABSPATH . 'wp-admin/admin-footer.php');
 
@@ -149,8 +152,8 @@ if ( isset($_GET['action']) ) {
 
                check_admin_referer('upgrade-theme_' . $theme);
 
-               add_thickbox();
-               wp_enqueue_script('theme-preview');
+               wp_enqueue_script( 'customize-loader' );
+
                $title = __('Update Theme');
                $parent_file = 'themes.php';
                $submenu_file = 'themes.php';
@@ -191,18 +194,18 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'install-theme' == $action ) {
 
                if ( ! current_user_can('install_themes') )
-                       wp_die(__('You do not have sufficient permissions to install themes for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
 
                check_admin_referer('install-theme_' . $theme);
-               $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
+               $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
                if ( is_wp_error($api) )
                        wp_die($api);
 
-               add_thickbox();
-               wp_enqueue_script('theme-preview');
+               wp_enqueue_script( 'customize-loader' );
+
                $title = __('Install Themes');
                $parent_file = 'themes.php';
                $submenu_file = 'themes.php';
@@ -221,26 +224,30 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'upload-theme' == $action ) {
 
                if ( ! current_user_can('install_themes') )
-                       wp_die(__('You do not have sufficient permissions to install themes for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
                check_admin_referer('theme-upload');
 
                $file_upload = new File_Upload_Upgrader('themezip', 'package');
 
+               wp_enqueue_script( 'customize-loader' );
+
                $title = __('Upload Theme');
                $parent_file = 'themes.php';
                $submenu_file = 'theme-install.php';
-               add_thickbox();
-               wp_enqueue_script('theme-preview');
+
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
                $nonce = 'theme-upload';
-               $url = add_query_arg(array('package' => $file_upload->filename), 'update.php?action=upload-theme');
+               $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
                $type = 'upload'; //Install plugin type, From Web or an Upload.
 
                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-               $upgrader->install( $file_upload->package );
+               $result = $upgrader->install( $file_upload->package );
+
+               if ( $result || is_wp_error($result) )
+                       $file_upload->cleanup();
 
                include(ABSPATH . 'wp-admin/admin-footer.php');