WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only clean up the uploaded files after a successful (or failed) install. Allows files to persist past the FTP credential screen. See #18182 

git-svn-id: http://svn.automattic.com/wordpress/branches/3.2@18713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2011-09-19 04:54:04 +00:00
parent 70b9c2dc51
commit 26d1310952
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/class-wp-upgrader.php
View File

@ -399,9 +399,13 @@ class Plugin_Upgrader extends WP_Upgrader {
'hook_extra' => array()
));
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
// Force refresh of plugin update information
delete_site_transient('update_plugins');
return true;
}
function upgrade($plugin) {
@ -645,10 +649,7 @@ class Theme_Upgrader extends WP_Upgrader {
// Force refresh of theme update information
delete_site_transient('update_themes');
if ( empty($result['destination_name']) )
return false;
else
return $result['destination_name'];
return true;
}
function upgrade($theme) {

10
wp-admin/update.php
View File

@ -138,9 +138,10 @@ if ( isset($_GET['action']) ) {
$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 );
$file_upload->cleanup();
if ( $result || is_wp_error($result) )
$file_upload->cleanup();
include(ABSPATH . 'wp-admin/admin-footer.php');
@ -242,9 +243,10 @@ if ( isset($_GET['action']) ) {
$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 );
$file_upload->cleanup();
if ( $result || is_wp_error($result) )
$file_upload->cleanup();
include(ABSPATH . 'wp-admin/admin-footer.php');