Changeset 45353 for branches/5.2

Timestamp:

05/17/2019 01:30:15 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Media: Fix deletion of files on Windows.

wp_delete_file_from_directory() should always normalize file paths before comparing.

Props tonybogdanov, SergeyBiryukov.
Merges [45352] to the 5.2 branch.
Fixes #47185.

Location:

branches/5.2

Files:

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

branches/5.2/src/wp-includes/functions.php

@@ -6283 +6283 @@
 function wp_delete_file_from_directory( $file, $directory ) {
         if ( wp_is_stream( $file ) ) {
-                $real_file      = wp_normalize_path( $file );
-                $real_directory = wp_normalize_path( $directory );
+                $real_file      = $file;
+                $real_directory = $directory;
         } else {
                 $real_file      = realpath( wp_normalize_path( $file ) );
                 $real_directory = realpath( wp_normalize_path( $directory ) );
+        }
+
+        if ( false !== $real_file ) {
+                $real_file = wp_normalize_path( $real_file );
+        }
+
+        if ( false !== $real_directory ) {
+                $real_directory = wp_normalize_path( $real_directory );
         }