Changeset 25649 for trunk/src/wp-admin/includes/class-wp-upgrader.php

Timestamp:

09/30/2013 12:20:35 AM (11 years ago)

Author:

dd32

Message:

Automatic Updates: Add a rollback functionality upon installation failure, the rollback package will be available for partial-updates for automatic updates and be similar to our existing partial builds (but in reverse).
A further iteration of this is to also detect whitescreens (fatals) after a auto update, and trigger the rollback for that too.
See #22704

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (6 diffs)

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

@@ -1225 +1225 @@
         $this->strings['copy_failed'] = __('Could not copy files.');
         $this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.' );
+        $this->strings['start_rollback'] = __( 'Attempting to rollback to previous version.' );
+        $this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version' );
     }
 
@@ -1231 +1233 @@
 
         $defaults = array(
-            'pre_check_md5' => true,
+            'pre_check_md5'    => true,
+            'attempt_rollback' => false,
+            'do_rollback'      => false,
         );
         $parsed_args = wp_parse_args( $args, $defaults );
@@ -1252 +1256 @@
 
         $no_partial = false;
-        if ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
+        if ( $parsed_args['do_rollback'] )
+            $no_partial = true;
+        elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
             $no_partial = true;
 
@@ -1259 +1265 @@
         // Don't though if the constant is set to skip bundled items.
         // If the API returns a no_content zip, go with it. Finally, default to the full zip.
-        if ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && ! $no_partial )
+        if ( $parsed_args['do_rollback'] && $current->packages->rollback )
+            $to_download = 'rollback';
+        elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && ! $no_partial )
             $to_download = 'partial';
         elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
@@ -1284 +1292 @@
         $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
 
-        require(ABSPATH . 'wp-admin/includes/update-core.php');
+        require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
 
         if ( ! function_exists( 'update_core' ) )
             return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
 
-        $result = update_core( $working_dir, $wp_dir );
+        $result = update_core( $working_dir, $wp_dir, $parsed_args['do_rollback'] );
+
+        // In the event of an error, rollback to the previous version
+        if ( is_wp_error( $result ) && $parsed_args['attempt_rollback'] && $current->packages->rollback ) {
+            apply_filters( 'update_feedback', $result );
+            apply_filters( 'update_feedback', $this->strings['start_rollback'] );
+
+            $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
+
+            $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'] );
+        }
         do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result );
         return $result;
@@ -1631 +1649 @@
             'clear_update_cache' => false,
             'pre_check_md5'      => false, /* always use partial builds if possible for core updates */
+            'attempt_rollback'   => true, /* only available for core updates */
         ) );