From de504cbaee5d59b7f82a06bd58030eeb81bc1a56 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 11 Mar 2023 11:32:54 +0000 Subject: [PATCH] Filesystem API: Return correct error data from `copy_dir()` if the directory listing failed. The `::dirlist()` method is run on the `$from` directory, so `basename( $from )` is the correct thing to pass to the `WP_Error` object. Follow-up to [50149]. Props afragen, costdev, pravinparmar2404. Fixes #57907. git-svn-id: https://develop.svn.wordpress.org/trunk@55538 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index 0f6acc69b4..2770a2e15e 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -1904,7 +1904,7 @@ function copy_dir( $from, $to, $skip_list = array() ) { $dirlist = $wp_filesystem->dirlist( $from ); if ( false === $dirlist ) { - return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $to ) ); + return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $from ) ); } $from = trailingslashit( $from );