From 394ab0c97f45e96dd156e1de6e1df366ccf98b93 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 11 Oct 2022 15:26:01 +0000 Subject: [PATCH] Upgrade/Install: Revert a temporary conditional for testing the Rollbacks feature project. This will be readded in 6.2-alpha after a 6.1 branch is created. Follow-up to [53578]. See #56057. git-svn-id: https://develop.svn.wordpress.org/trunk@54484 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-upgrader.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php index a2b2c9ed06..50309630dc 100644 --- a/src/wp-admin/includes/class-wp-upgrader.php +++ b/src/wp-admin/includes/class-wp-upgrader.php @@ -594,23 +594,7 @@ class WP_Upgrader { } // Copy new version of item into place. - if ( class_exists( 'Rollback_Update_Failure\WP_Upgrader' ) - && function_exists( '\Rollback_Update_Failure\move_dir' ) - ) { - /* - * If the {@link https://wordpress.org/plugins/rollback-update-failure/ Rollback Update Failure} - * feature plugin is installed, use the move_dir() function from there for better performance. - * Instead of copying a directory from one location to another, it uses the rename() PHP function - * to speed up the process. If the renaming failed, it falls back to copy_dir(). - * - * This condition aims to facilitate broader testing of the Rollbacks (temp backups) feature project. - * It is temporary, until the plugin is merged into core. - */ - $result = \Rollback_Update_Failure\move_dir( $source, $remote_destination ); - } else { - $result = copy_dir( $source, $remote_destination ); - } - + $result = copy_dir( $source, $remote_destination ); if ( is_wp_error( $result ) ) { if ( $args['clear_working'] ) { $wp_filesystem->delete( $remote_source, true );