Ticket #35996: 35996.diff

src/wp-includes/functions.php

@@ -1675 +1675 @@
  * @param string $path Path relative to $base.
  * @return string The path with the base or absolute path.
  */
 function path_join( $base, $path ) {
         if ( path_is_absolute($path) )
                 return $path;
 
         return rtrim($base, '/') . '/' . ltrim($path, '/');
 }
 
 /**
  * Normalize a filesystem path.
  *
  * 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.
  * @return string Normalized path.
  */
 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 );
         }
         return $path;
 }
 
 /**
  * Determine a writable directory for temporary files.
  *
  * Function's preference is the return value of sys_get_temp_dir(),
  * followed by your PHP temporary upload directory, followed by WP_CONTENT_DIR,
  * before finally defaulting to /tmp/
  *
  * In the event that this function does not find a writable location,
  * It may be overridden by the WP_TEMP_DIR constant in your wp-config.php file.

tests/phpunit/tests/file.php

@@ -163 +163 @@
                 unlink( $file );
 
                 $this->assertNotEmpty( basename( basename( $file, '.tmp' ), '.zip' ) );
         }
         function data_wp_tempnam_filenames() {
                 return array(
                         array( '0.zip' ),
                         array( '0.1.2.3.zip' ),
                         array( 'filename.zip' ),
                         array( 'directory/0.zip' ),
                         array( 'directory/filename.zip' ),
                         array( 'directory/0/0.zip' ),
                 );
         }
 
+        /**
+         * @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' ),
+                );
+        }
 }