Changeset 55229

Timestamp:

02/06/2023 02:46:01 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Send language pack updates to copy_dir().

If the clear_working flag in WP_Upgrader::install_package() is false, the source should not be removed, so copy_dir() should be used instead.

Partial updates, like language packs, may want to retain the destination. If the destination exists or has contents, this may be a partial update, and the destination should not be removed, so copy_dir() should be used instead.

Follow-up to [55204], [55219], [55220], [55223], [55226].

Props afragen, costdev, swissspidy.
See #57557.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

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

@@ -589 +589 @@
 
                 /*
-                 * 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_working' is false, the source should not be removed, so use copy_dir() instead.
+                 *
+                 * Partial updates, like language packs, may want to retain the destination.
+                 * If the destination exists or has contents, this may be a partial update,
+                 * and the destination should not be removed, so use copy_dir() instead.
                  */
-                if ( $clear_destination && $args['clear_working'] ) {
+                if ( $args['clear_working']
+                        && (
+                                // Destination does not exist or has no contents.
+                                ! $wp_filesystem->exists( $remote_destination )
+                                || empty( $wp_filesystem->dirlist( $remote_destination ) )
+                        )
+                ) {
                         $result = move_dir( $source, $remote_destination, true );
                 } else {