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

Timestamp:

10/14/2013 09:02:46 PM (13 years ago)

Author:

nacin

Message:

Auto updates: Only attempt a roll back when we've hit a critical error code.

Specifically, this means when we've failed in copying files.

see #22704.

File:

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

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

@@ -160 +160 @@
 
                 // Unzip package to working directory
-                $result = unzip_file($package, $working_dir); //TODO optimizations, Copy when Move/Rename would suffice?
+                $result = unzip_file( $package, $working_dir );
 
                 // Once extracted, delete the package if required.
@@ -1299 +1299 @@
                 $result = update_core( $working_dir, $wp_dir );
 
-                // In the event of an error, rollback to the previous version
-                if ( is_wp_error( $result ) && $parsed_args['attempt_rollback'] && $current->packages->rollback && ! $parsed_args['do_rollback'] ) {
-                        apply_filters( 'update_feedback', $result );
-                        apply_filters( 'update_feedback', $this->strings['start_rollback'] );
-
-                        $rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
-
-                        $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], array( 'rollback' => $rollback_result, 'update' => $result ) );
-                }
+                // In the event of an issue, we may be able to roll back.
+                if ( $parsed_args['attempt_rollback'] && $current->packages->rollback && ! $parsed_args['do_rollback'] ) {
+                        $try_rollback = false;
+                        if ( is_wp_error( $result ) ) {
+                                $error_code = $result->get_error_code();
+                                // Not all errors are equal. These codes are critical: copy_failed__copy_dir,
+                                // mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
+                                if ( false !== strpos( $error_code, '__copy_dir' ) )
+                                        $try_rollback = true;
+                                elseif ( 'disk_full' === $error_code )
+                                        $try_rollback = true;
+                        }
+
+                        if ( $try_rollback ) {
+                                apply_filters( 'update_feedback', $result );
+                                apply_filters( 'update_feedback', $this->strings['start_rollback'] );
+
+                                $rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
+
+                                $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], array( 'rollback' => $rollback_result, 'update' => $result ) );
+                        }
+                }
+
                 do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result );
                 return $result;