Changeset 46965 for trunk/src/wp-includes/functions.php

Timestamp:

12/16/2019 11:22:00 PM (7 years ago)

Author:

azaozz

Message:

Upload:

• Fix PHP warnings in wp_unique_filename() when the destination directory is unreadable.
• Run the final name collision test only for files that are saved to the uploads directory.
• Update the unit tests to match.

Props eden159, audrasjb, azaozz.
Fixes #48960 for trunk.

File:

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

trunk/src/wp-includes/functions.php

@@ -2473 +2473 @@
                 // Prevent collisions with existing file names that contain dimension-like strings
                 // (whether they are subsizes or originals uploaded prior to #42437).
+                $upload_dir = wp_get_upload_dir();
 
                 // The (resized) image files would have name and extension, and will be in the uploads dir.
-                if ( @is_dir( $dir ) && $name && $ext ) {
-                        // List of all files and directories contained in $dir (with the "dot" files removed).
-                        $files = array_diff( scandir( $dir ), array( '.', '..' ) );
+                if ( $name && $ext && @is_dir( $dir ) && false !== strpos( $dir, $upload_dir['basedir'] ) ) {
+                        // List of all files and directories contained in $dir.
+                        $files = @scandir( $dir );
+
+                        if ( ! empty( $files ) ) {
+                                // Remove "dot" dirs.
+                                $files = array_diff( $files, array( '.', '..' ) );
+                        }
 
                         if ( ! empty( $files ) ) {