Changeset 36881

Timestamp:

03/08/2016 05:59:45 AM (9 years ago)

Author:

dd32

Message:

Filesystem: Support Windows shares/DFS roots in wp_normalize_path().

Props rilwis for initial patch.
Fixes #35996.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -1688 +1688 @@
  * On windows systems, replaces backslashes with forward slashes
  * and forces upper-case drive letters.
- * Ensures that no duplicate slashes exist.
+ * Allows for two leading slashes for Windows network shares, but
+ * ensures that all other duplicate slashes are reduced to a single.
  *
  * @since 3.9.0
  * @since 4.4.0 Ensures upper-case drive letters on Windows systems.
+ * @since 4.5.0 Allows for Windows network shares.
  *
  * @param string $path Path to normalize.
@@ -1698 +1700 @@
 function wp_normalize_path( $path ) {
     $path = str_replace( '\\', '/', $path );
-    $path = preg_replace( '|/+|','/', $path );
+    $path = preg_replace( '|(?<=.)/+|', '/', $path );
     if ( ':' === substr( $path, 1, 1 ) ) {
         $path = ucfirst( $path );

trunk/tests/phpunit/tests/file.php

@@ -176 +176 @@
     }
 
+    /**
+     * @dataProvider data_wp_normalize_path
+     */
+    function test_wp_normalize_path( $path, $expected ) {
+        $this->assertEquals( $expected, wp_normalize_path( $path ) );
+    }
+    function data_wp_normalize_path() {
+        return array(
+            // Windows paths
+            array( 'C:\\www\\path\\', 'C:/www/path/' ),
+            array( 'C:\\www\\\\path\\', 'C:/www/path/' ),
+            array( 'c:/www/path', 'C:/www/path' ),
+            array( 'c:\\www\\path\\', 'C:/www/path/' ), // uppercase drive letter
+            array( '\\\\Domain\\DFSRoots\\share\\path\\', '//Domain/DFSRoots/share/path/' ),
+            array( '\\\\Server\\share\\path', '//Server/share/path' ),
+
+            // Linux paths
+            array( '/www/path/', '/www/path/' ),
+            array( '/www/path/////', '/www/path/' ),
+            array( '/www/path', '/www/path' ),
+        );
+    }
 }