WordPress.org
Get WordPress

Make WordPress Core

Ticket #53284: 53284.2.diff

File 53284.2.diff, 825 bytes (added by devutpol, 5 years ago)

I thought of a different solution and uploaded 53284-2.diff. WP_Error object is now stored in $upgrade_result with a new error and I believe it now works correctly. This is my first submission for WordPress Core so I apologize if I have made any mistakes with the Trac workflow.

  • src/wp-admin/includes/class-wp-automatic-updater.php 

    diff --git a/src/wp-admin/includes/class-wp-automatic-updater.php b/src/wp-admin/includes/class-wp-automatic-updater.php
index 641db4b325..8e71e7559a 100644
    a b class WP_Automatic_Updater {  
    418418                                return false;
    419419                        }
    420420
    421                         // Core doesn't output this, so let's append it so we don't get confused.
     421                        // Core doesn't output this, so let's append it, so we don't get confused.
    422422                        if ( is_wp_error( $upgrade_result ) ) {
    423                                 $skin->error( __( 'Installation failed.' ), $upgrade_result );
     423                                $upgrade_result->add( 'installation_failed', __( 'Installation failed.' ) );
     424                                $skin->error( $upgrade_result );
    424425                        } else {
    425426                                $skin->feedback( __( 'WordPress updated successfully.' ) );
    426427                        }