Changeset 42387

Timestamp:

12/12/2017 04:15:54 AM (9 years ago)

Author:

dd32

Message:

Filesystem: Allow wp_normalise_path() to handle PHP stream wrappers such as php:// correctly.

Props calin, dd32.
Fixes #42837.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -1765 +1765 @@
  * @since 4.4.0 Ensures upper-case drive letters on Windows systems.
  * @since 4.5.0 Allows for Windows network shares.
+ * @since 5.0.0 Allows for PHP file wrappers.
  *
  * @param string $path Path to normalize.
@@ -1770 +1771 @@
  */
 function wp_normalize_path( $path ) {
+        $wrapper = '';
+        if ( wp_is_stream( $path ) ) {
+                list( $wrapper, $path ) = explode( '://', $path, 2 );
+                $wrapper .= '://';
+        }
+
+        // Standardise all paths to use /
         $path = str_replace( '\\', '/', $path );
+
+        // Replace multiple slashes down to a singular, allowing for network shares having two slashes.
         $path = preg_replace( '|(?<=.)/+|', '/', $path );
+
+        // Windows paths should uppercase the drive letter
         if ( ':' === substr( $path, 1, 1 ) ) {
                 $path = ucfirst( $path );
         }
-        return $path;
+
+        return $wrapper . $path;
 }
 

trunk/tests/phpunit/tests/functions.php

@@ -151 +151 @@
                         array( '/www/path/////', '/www/path/' ),
                         array( '/www/path', '/www/path' ),
+
+                        // PHP Stream wrappers
+                        array( 'php://input', 'php://input' ),
+                        array( 'http://example.com//path.ext', 'http://example.com/path.ext' ),
+                        array( 'file://c:\\www\\path\\', 'file://C:/www/path/' ),
                 );
         }