From 186a5379e8b71be9afac5a2872ff9fa5260da633 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Thu, 10 Oct 2013 01:57:08 +0000 Subject: [PATCH] After a upgrade fails, and we successfully rollback to a previous version, Don't send the version we rolled back to to the API, just that it was successful. See [25750]. See #22704 Built from https://develop.svn.wordpress.org/trunk@25752 git-svn-id: http://core.svn.wordpress.org/trunk@25665 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-upgrader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 041fc3a56d..26020f1843 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1736,7 +1736,7 @@ class WP_Automatic_Upgrader { if ( is_wp_error( $core_update_result ) && 'rollback_was_required' == $core_update_result->get_error_code() ) { $rollback_data = $core_update_result->get_error_data(); $extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update']; - $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : $rollback_data['rollback']; + $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : true; // If it's not a WP_Error, the rollback was successful. } $extra_update_stats['fs_method'] = $GLOBALS['wp_filesystem']->method; $extra_update_stats['time_taken'] = ( time() - $start_time );