Changeset 55220

Timestamp:

02/04/2023 03:29:43 AM (4 years ago)

Author:

azaozz

Message:

Upgrade/Install: Use move_dir() instead of copy_dir() in WP_Upgrader::install_package() when possible. This would make the filesystem operations a lot faster in most cases, and potentially reduce failures.

Props: afragen, costdev, peterwilsoncc, pbiron, mukesh27, SergeyBiryukov, azaozz.
Fixes: #57557.

File:

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

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

@@ -430 +430 @@
          *
          * @since 2.8.0
+         * @since 6.2.0 Use move_dir() instead of copy_dir() when possible.
          *
          * @global WP_Filesystem_Base $wp_filesystem        WordPress filesystem subclass.
@@ -587 +588 @@
                 }
 
-                // Create destination if needed.
-                if ( ! $wp_filesystem->exists( $remote_destination ) ) {
-                        if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
-                                return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
-                        }
-                }
-
-                // Copy new version of item into place.
-                $result = copy_dir( $source, $remote_destination );
+                /*
+                 * Partial updates may want to retain the destination.
+                 * move_dir() returns a WP_Error when the destination exists,
+                 * so copy_dir() should be used.
+                 *
+                 * If 'clear_working' is false, the source shouldn't be removed.
+                 * After move_dir() runs, the source will no longer exist.
+                 * Therefore, copy_dir() should be used.
+                 */
+                if ( $clear_destination && $args['clear_working'] ) {
+                        $result = move_dir( $source, $remote_destination, true );
+                } else {
+                        // Create destination if needed.
+                        if ( ! $wp_filesystem->exists( $remote_destination ) ) {
+                                if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
+                                        return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
+                                }
+                        }
+                        $result = copy_dir( $source, $remote_destination );
+                }
 
                 // Clear the working folder?