Changeset 18616

Timestamp:

08/28/2011 05:51:38 AM (13 years ago)

Author:

dd32

Message:

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

Location:

trunk/wp-admin

Files:

• includes/class-wp-upgrader.php (modified) (2 diffs)
• update.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -400 +400 @@
                     ));
 
+        if ( ! $this->result || is_wp_error($this->result) )
+            return $this->result;
+
         // Force refresh of plugin update information
         delete_site_transient('update_plugins');
 
+        return true;
     }
 
@@ -647 +651 @@
         delete_site_transient('update_themes');
 
-        if ( empty($result['destination_name']) )
-            return false;
-        else
-            return $result['destination_name'];
+        return true;
     }
 

trunk/wp-admin/update.php

@@ -139 +139 @@
 
         $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-        $upgrader->install( $file_upload->package );
-
-        $file_upload->cleanup();
+        $result = $upgrader->install( $file_upload->package );
+
+        if ( $result || is_wp_error($result) )
+            $file_upload->cleanup();
 
         include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -243 +244 @@
 
         $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-        $upgrader->install( $file_upload->package );
-
-        $file_upload->cleanup();
+        $result = $upgrader->install( $file_upload->package );
+
+        if ( $result || is_wp_error($result) )
+            $file_upload->cleanup();
 
         include(ABSPATH . 'wp-admin/admin-footer.php');