Changeset 51902

Timestamp:

10/11/2021 03:07:52 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Restore or clean up the temporary plugin or theme backup on shutdown.

This allows these actions to run after the main process, without affecting the update. Actions running on shutdown are immune to PHP timeouts, so in case the failure was due to a PHP timeout, we'll still be able to properly restore the previous version.

Follow-up to [51815], [51898], [51899].

Props aristath, peterwilsoncc.
See #54166.

File:

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

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

@@ -844 +844 @@
         if ( is_wp_error( $result ) ) {
             if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
-                $this->restore_temp_backup( $options['hook_extra']['temp_backup'] );
+                /*
+                 * Restore the backup on shutdown.
+                 * Actions running on `shutdown` are immune to PHP timeouts,
+                 * so in case the failure was due to a PHP timeout,
+                 * we'll still be able to properly restore the previous version.
+                 */
+                add_action(
+                    'shutdown',
+                    function() use ( $options ) {
+                        $this->restore_temp_backup( $options['hook_extra']['temp_backup'] );
+                    }
+                );
             }
             $this->skin->error( $result );
@@ -860 +871 @@
         // Clean up the backup kept in the temp-backup directory.
         if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
-            $this->delete_temp_backup( $options['hook_extra']['temp_backup'] );
+            // Delete the backup on `shutdown` to avoid a PHP timeout.
+            add_action(
+                'shutdown',
+                function() use ( $options ) {
+                    $this->delete_temp_backup( $options['hook_extra']['temp_backup'] );
+                }
+            );
         }