Changeset 45177

Timestamp:

04/12/2019 08:00:42 PM (6 years ago)

Author:

joemcgill

Message:

Media: Fix deletion of files when using stream wrappers.

This fixes a bug introduced in [43392] which breaks file deletion on systems using stream wrappers, due to limitations of realpath().

Props antonypuckey, pfiled.
Fixes #44563.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -1831 +1831 @@
  */
 function path_is_absolute( $path ) {
+    /*
+     * Check to see if the path is a stream and check to see if its an actual
+     * path or file as realpath() does not support stream wrappers.
+     */
+    if ( wp_is_stream( $path ) && ( is_dir( $path ) || is_file( $path ) ) ) {
+        return true;
+    }
+
     /*
      * This is definitive if true but fails if $path does not exist or contains
@@ -6270 +6278 @@
  */
 function wp_delete_file_from_directory( $file, $directory ) {
-    $real_file      = realpath( wp_normalize_path( $file ) );
-    $real_directory = realpath( wp_normalize_path( $directory ) );
-
-    if ( false === $real_file || false === $real_directory || strpos( wp_normalize_path( $real_file ), trailingslashit( wp_normalize_path( $real_directory ) ) ) !== 0 ) {
+    if ( wp_is_stream( $file ) ) {
+        $real_file      = wp_normalize_path( $file );
+        $real_directory = wp_normalize_path( $directory );
+    } else {
+        $real_file      = realpath( wp_normalize_path( $file ) );
+        $real_directory = realpath( wp_normalize_path( $directory ) );
+    }
+
+    if ( false === $real_file || false === $real_directory || strpos( $real_file, trailingslashit( $real_directory ) ) !== 0 ) {
         return false;
     }