Ticket #27365: 27365.2.diff

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

@@ -635 +635 @@
                  *     @type bool   $abort_if_destination_exists Abort if the Destination directory exists.
                  *     @type bool   $is_multi                    Whether the upgrader is running multiple times.
                  *     @type array  $hook_extra                  Extra hook arguments.
                  * }
                  */
                 $options = apply_filters( 'upgrader_package_options', $options );
 
                 if ( ! $options['is_multi'] ) { // call $this->header separately if running multiple times
                         $this->skin->header();
                 }
 
                 // Connect to the Filesystem first.
                 $res = $this->fs_connect( array( WP_CONTENT_DIR, $options['destination'] ) );
                 // Mainly for non-connected filesystem.
                 if ( ! $res ) {
+                        $this->result = $res;
                         if ( ! $options['is_multi'] ) {
                                 $this->skin->footer();
                         }
                         return false;
                 }
 
                 $this->skin->before();
 
                 if ( is_wp_error($res) ) {
+                        $this->result = $res;
                         $this->skin->error($res);
                         $this->skin->after();
                         if ( ! $options['is_multi'] ) {
                                 $this->skin->footer();
                         }
                         return $res;
                 }
 
                 /*
                  * Download the package (Note, This just returns the filename
                  * of the file if the package is a local file)
                  */
                 $download = $this->download_package( $options['package'] );
                 if ( is_wp_error($download) ) {
+                        $this->result = $download;
                         $this->skin->error($download);
                         $this->skin->after();
                         if ( ! $options['is_multi'] ) {
                                 $this->skin->footer();
                         }
                         return $download;
                 }
 
                 $delete_package = ( $download != $options['package'] ); // Do not delete a "local" file
 
                 // Unzips the file into a temporary directory.
                 $working_dir = $this->unpack_package( $download, $delete_package );
                 if ( is_wp_error($working_dir) ) {
+                        $this->result = $working_dir;
                         $this->skin->error($working_dir);
                         $this->skin->after();
                         if ( ! $options['is_multi'] ) {
                                 $this->skin->footer();
                         }
                         return $working_dir;
                 }
 
                 // With the given options, this installs it to the destination directory.
                 $result = $this->install_package( array(
                         'source' => $working_dir,
                         'destination' => $options['destination'],
                         'clear_destination' => $options['clear_destination'],
                         'abort_if_destination_exists' => $options['abort_if_destination_exists'],
                         'clear_working' => $options['clear_working'],
                         'hook_extra' => $options['hook_extra']
                 ) );
 
                 $this->skin->set_result($result);
                 if ( is_wp_error($result) ) {
+                        $this->result = $result;
                         $this->skin->error($result);
                         $this->skin->feedback('process_failed');
                 } else {
                         // Install succeeded.
                         $this->skin->feedback('process_success');
                 }
 
                 $this->skin->after();
 
                 if ( ! $options['is_multi'] ) {
 
                         /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
                         do_action( 'upgrader_process_complete', $this, $options['hook_extra'] );
                         $this->skin->footer();
                 }