Changeset 55223

Timestamp:

02/04/2023 03:35:29 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Filesystem API: Simplify two conditionals in move_dir().

This updates the check whether the destination directory already exists to only call $wp_filesystem->exists() once.

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

Props azaozz, afragen, SergeyBiryukov.
Fixes #57375.

File:

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

trunk/src/wp-admin/includes/file.php

@@ -1972 +1972 @@
 
     if ( trailingslashit( strtolower( $from ) ) === trailingslashit( strtolower( $to ) ) ) {
-        return new WP_Error(
-            'source_destination_same_move_dir',
-            __( 'The source and destination are the same.' )
-        );
-    }
-
-    if ( ! $overwrite && $wp_filesystem->exists( $to ) ) {
-        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 ) ) {
-        // 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.' ) );
+        return new WP_Error( 'source_destination_same_move_dir', __( 'The source and destination are the same.' ) );
+    }
+
+    if ( $wp_filesystem->exists( $to ) ) {
+        if ( ! $overwrite ) {
+            return new WP_Error( 'destination_already_exists_move_dir', __( 'The destination folder already exists.' ), $to );
+        } elseif ( ! $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.' ) );
+        }
     }