Ticket #57375: 57375.diff

src/wp-admin/includes/file.php

@@ -1971 +1971 @@
         global $wp_filesystem;
 
         if ( trailingslashit( strtolower( $from ) ) === trailingslashit( strtolower( $to ) ) ) {
-                return new WP_Error(
-                        'source_destination_same_move_dir',
-                        __( 'The source and destination are the same.' )
-                );
+                return new WP_Error( 'source_destination_same_move_dir', __( 'The source and destination are the same.' ) );
         }
 
-        if ( ! $overwrite && $wp_filesystem->exists( $to ) ) {
+        $destination_exists = $wp_filesystem->exists( $to );
+
+        if ( ! $overwrite && $destination_exists ) {
                 return new WP_Error( 'destination_already_exists_move_dir', __( 'The destination folder already exists.' ), $to );
         }
 
-        if ( $overwrite && $wp_filesystem->exists( $to ) && ! $wp_filesystem->delete( $to, true ) ) {
+        if ( $overwrite && $destination_exists && ! $wp_filesystem->delete( $to, true ) ) {
                 // Can't overwrite if the destination couldn't be deleted.
                 return WP_Error( 'destination_not_deleted_move_dir', __( 'The destination directory already exists and could not be removed.' ) );
         }