mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-27 10:02:43 +01:00
Code Issues Actions 12 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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18616 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2011-08-28 05:51:38 +00:00
parent 9c571521a3
commit 4f8bd53070
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) {
@ -646,10 +650,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');