Make WordPress Core


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/update.php

    r18614 r18616  
    139139
    140140        $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
    141         $upgrader->install( $file_upload->package );
    142 
    143         $file_upload->cleanup();
     141        $result = $upgrader->install( $file_upload->package );
     142
     143        if ( $result || is_wp_error($result) )
     144            $file_upload->cleanup();
    144145
    145146        include(ABSPATH . 'wp-admin/admin-footer.php');
     
    243244
    244245        $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
    245         $upgrader->install( $file_upload->package );
    246 
    247         $file_upload->cleanup();
     246        $result = $upgrader->install( $file_upload->package );
     247
     248        if ( $result || is_wp_error($result) )
     249            $file_upload->cleanup();
    248250
    249251        include(ABSPATH . 'wp-admin/admin-footer.php');
Note: See TracChangeset for help on using the changeset viewer.