Changeset 55720

Timestamp:

05/04/2023 02:34:58 AM (15 months ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Create a temporary backup of plugins and themes before updating.

This aims to make the update process more reliable and ensures that if a plugin or theme update fails, the previous version can be safely restored.

• When updating a plugin or theme, the old version is moved to a temporary backup directory:
  • wp-content/upgrade-temp-backup/plugins/[plugin-slug] for plugins
  • wp-content/upgrade-temp-backup/themes/[theme-slug] for themes.

• If the update fails, then the backup kept in the temporary backup directory is restored to its original location.
• If the update succeeds, the temporary backup is deleted.

To further help troubleshoot plugin and theme updates, two new checks were added to the Site Health screen:

• A check to make sure that the upgrade-temp-backup directory is writable.
• A check that there is enough disk space available to safely perform updates.

To avoid confusion: The temporary backup directory will NOT be used to “roll back” a plugin to a previous version after a completed update. This directory will simply contain a transient backup of the previous version of a plugin or theme being updated, and as soon as the update process finishes, the directory will be empty.

Follow-up to [55204], [55220].

Props afragen, costdev, pbiron, azaozz, hellofromTonya, aristath, peterwilsoncc, TJNowell, bronsonquick, Clorith, dd32, poena, TimothyBlynJacobs, audrasjb, mikeschroder, a2hosting, KZeni, galbaras, richards1052, Boniu91, mai21, francina, TobiasBg, desrosj, noisysocks, johnbillion, dlh, chaion07, davidbaumwald, jrf, thisisyeasin, ignatggeorgiev, SergeyBiryukov.
Fixes #51857.

Location:

trunk/src

Files:

• wp-admin/includes/class-plugin-upgrader.php (modified) (2 diffs)
• wp-admin/includes/class-theme-upgrader.php (modified) (2 diffs)
• wp-admin/includes/class-wp-site-health.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (9 diffs)
• wp-includes/update.php (modified) (2 diffs)

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

@@ -227 +227 @@
                 'clear_working'     => true,
                 'hook_extra'        => array(
-                    'plugin' => $plugin,
-                    'type'   => 'plugin',
-                    'action' => 'update',
+                    'plugin'      => $plugin,
+                    'type'        => 'plugin',
+                    'action'      => 'update',
+                    'temp_backup' => array(
+                        'slug' => dirname( $plugin ),
+                        'src'  => WP_PLUGIN_DIR,
+                        'dir'  => 'plugins',
+                    ),
                 ),
             )
@@ -343 +348 @@
                     'is_multi'          => true,
                     'hook_extra'        => array(
-                        'plugin' => $plugin,
+                        'plugin'      => $plugin,
+                        'temp_backup' => array(
+                            'slug' => dirname( $plugin ),
+                            'src'  => WP_PLUGIN_DIR,
+                            'dir'  => 'plugins',
+                        ),
                     ),
                 )

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

@@ -329 +329 @@
                 'clear_working'     => true,
                 'hook_extra'        => array(
-                    'theme'  => $theme,
-                    'type'   => 'theme',
-                    'action' => 'update',
+                    'theme'       => $theme,
+                    'type'        => 'theme',
+                    'action'      => 'update',
+                    'temp_backup' => array(
+                        'slug' => $theme,
+                        'src'  => get_theme_root( $theme ),
+                        'dir'  => 'themes',
+                    ),
                 ),
             )
@@ -444 +449 @@
                     'is_multi'          => true,
                     'hook_extra'        => array(
-                        'theme' => $theme,
+                        'theme'       => $theme,
+                        'temp_backup' => array(
+                            'slug' => $theme,
+                            'src'  => get_theme_root( $theme ),
+                            'dir'  => 'themes',
+                        ),
                     ),
                 )

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -1927 +1927 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Tests if loopbacks work as expected.
      *
@@ -2533 +2720 @@
         $tests = array(
             'direct' => array(
-                'wordpress_version'         => array(
+                'wordpress_version'         => array(
                     'label' => __( 'WordPress Version' ),
                     'test'  => 'wordpress_version',
                 ),
-                'plugin_version'            => array(
+                'plugin_version'            => array(
                     'label' => __( 'Plugin Versions' ),
                     'test'  => 'plugin_version',
                 ),
-                'theme_version'             => array(
+                'theme_version'             => array(
                     'label' => __( 'Theme Versions' ),
                     'test'  => 'theme_version',
                 ),
-                'php_version'               => array(
+                'php_version'               => array(
                     'label' => __( 'PHP Version' ),
                     'test'  => 'php_version',
                 ),
-                'php_extensions'            => array(
+                'php_extensions'            => array(
                     'label' => __( 'PHP Extensions' ),
                     'test'  => 'php_extensions',
                 ),
-                'php_default_timezone'      => array(
+                'php_default_timezone'      => array(
                     'label' => __( 'PHP Default Timezone' ),
                     'test'  => 'php_default_timezone',
                 ),
-                'php_sessions'              => array(
+                'php_sessions'              => array(
                     'label' => __( 'PHP Sessions' ),
                     'test'  => 'php_sessions',
                 ),
-                'sql_server'                => array(
+                'sql_server'                => array(
                     'label' => __( 'Database Server version' ),
                     'test'  => 'sql_server',
                 ),
-                'utf8mb4_support'           => array(
+                'utf8mb4_support'           => array(
                     'label' => __( 'MySQL utf8mb4 support' ),
                     'test'  => 'utf8mb4_support',
                 ),
-                'ssl_support'               => array(
+                'ssl_support'               => array(
                     'label' => __( 'Secure communication' ),
                     'test'  => 'ssl_support',
                 ),
-                'scheduled_events'          => array(
+                'scheduled_events'          => array(
                     'label' => __( 'Scheduled events' ),
                     'test'  => 'scheduled_events',
                 ),
-                'http_requests'             => array(
+                'http_requests'             => array(
                     'label' => __( 'HTTP Requests' ),
                     'test'  => 'http_requests',
                 ),
-                'rest_availability'         => array(
+                'rest_availability'         => array(
                     'label'     => __( 'REST API availability' ),
                     'test'      => 'rest_availability',
                     'skip_cron' => true,
                 ),
-                'debug_enabled'             => array(
+                'debug_enabled'             => array(
                     'label' => __( 'Debugging enabled' ),
                     'test'  => 'is_in_debug_mode',
                 ),
-                'file_uploads'              => array(
+                'file_uploads'              => array(
                     'label' => __( 'File uploads' ),
                     'test'  => 'file_uploads',
                 ),
-                'plugin_theme_auto_updates' => array(
+                'plugin_theme_auto_updates' => array(
                     'label' => __( 'Plugin and theme auto-updates' ),
                     'test'  => 'plugin_theme_auto_updates',
+
+
+
+
+
+
+
+
                 ),
             ),

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

@@ -114 +114 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Construct the upgrader with a skin.
      *
@@ -135 +155 @@
      * and also add the generic strings to `WP_Upgrader::$strings`.
      *
+
+
      * @since 2.8.0
+
      */
     public function init() {
         $this->skin->set_upgrader( $this );
         $this->generic_strings();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -168 +206 @@
         $this->strings['maintenance_start'] = __( 'Enabling Maintenance mode…' );
         $this->strings['maintenance_end']   = __( 'Disabling Maintenance mode…' );
+
+
+
+
+
+
+
+
+
     }
 
@@ -309 +356 @@
         $this->skin->feedback( 'unpack_package' );
 
+
+
+
+
         $upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
 
@@ -533 +584 @@
         if ( is_wp_error( $source ) ) {
             return $source;
+
+
+
+
+
+
+
+
+
+
         }
 
@@ -615 +676 @@
         }
 
-        // Clear the working folder?
+        // Clear the working ?
         if ( $args['clear_working'] ) {
             $wp_filesystem->delete( $remote_source, true );
@@ -828 +889 @@
 
         $this->skin->set_result( $result );
+
         if ( is_wp_error( $result ) ) {
+
+
+
+
+
+
+
+
+
+
+
             $this->skin->error( $result );
 
@@ -840 +913 @@
 
         $this->skin->after();
+
+
+
+
+
+
 
         if ( ! $options['is_multi'] ) {
@@ -967 +1046 @@
         return delete_option( $lock_name . '.lock' );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/wp-includes/update.php

@@ -1078 +1078 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 if ( ( ! is_main_site() && ! is_network_admin() ) || wp_doing_ajax() ) {
     return;
@@ -1102 +1158 @@
 
 add_action( 'init', 'wp_schedule_update_checks' );
+
+