mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-01-17 12:58:25 +01:00
Code Issues Actions 98 Packages Projects Releases Wiki Activity

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

Browse Source 
Props rilwis for initial patch.
Fixes #35996.


git-svn-id: https://develop.svn.wordpress.org/trunk@36881 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2016-03-08 05:59:45 +00:00
parent d32216787e
commit 8d9b0a9d22
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/functions.php
View File

@ -1687,17 +1687,19 @@ function path_join( $base, $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 );
}

22
tests/phpunit/tests/file.php
View File

@ -175,4 +175,26 @@ class Tests_File extends WP_UnitTestCase {
);
}
/**
* @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' ),
);
}
}