Changeset 50149

Timestamp:

02/02/2021 05:21:45 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Return a WP_Error from copy_dir() and _copy_dir() if the directory listing failed.

Props afragen, dd32.
Fixes #52342.

Location:

trunk/src/wp-admin/includes

Files:

• file.php (modified) (1 diff)
• update-core.php (modified) (1 diff)

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

@@ -1777 +1777 @@
     $dirlist = $wp_filesystem->dirlist( $from );
 
+    if ( false === $dirlist ) {
+        return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $to ) );
+    }
+
     $from = trailingslashit( $from );
     $to   = trailingslashit( $to );

trunk/src/wp-admin/includes/update-core.php

@@ -1353 +1353 @@
     $dirlist = $wp_filesystem->dirlist( $from );
 
+    if ( false === $dirlist ) {
+        return new WP_Error( 'dirlist_failed__copy_dir', __( 'Directory listing failed.' ), basename( $to ) );
+    }
+
     $from = trailingslashit( $from );
     $to   = trailingslashit( $to );