From 8d7d99289d21bb8a1fc9bdb09c83bbbc528c6d7e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 11 Mar 2023 11:34:24 +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.
Built from https://develop.svn.wordpress.org/trunk@55538


git-svn-id: http://core.svn.wordpress.org/trunk@55050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/file.php | 2 +-
 wp-includes/version.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 0f6acc69b4..2770a2e15e 100644
--- a/wp-admin/includes/file.php
+++ b/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 );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 46d38bb8f1..c9ce3c78eb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.3-alpha-55537';
+$wp_version = '6.3-alpha-55538';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.