Changeset 34104

Timestamp:

09/14/2015 01:58:03 AM (11 years ago)

Author:

dd32

Message:

When running on windows systems, normalise the capitalisation of the drive letter for more reliable string comparisons.

Props tyxla
Fixes #33265

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

@@ -1576 +1576 @@
  * Normalize a filesystem path.
  *
- * Replaces backslashes with forward slashes for Windows systems, and ensures
- * no duplicate slashes exist.
+ * On windows systems, replaces backslashes with forward slashes
+ * and forces upper-case drive letters.
+ * Ensures that no duplicate slashes exist.
  *
  * @since 3.9.0
+ * @since 4.4.0 Ensures upper-case drive letters on Windows systems.
  *
  * @param string $path Path to normalize.
@@ -1587 +1589 @@
         $path = str_replace( '\\', '/', $path );
         $path = preg_replace( '|/+|','/', $path );
+        if ( ':' === substr( $path, 1, 1 ) ) {
+                $path = ucfirst( $path );
+        }
         return $path;
 }

trunk/tests/phpunit/tests/functions.php

@@ -112 +112 @@
                 foreach ($relative_paths as $path)
                         $this->assertFalse( path_is_absolute($path), "path_is_absolute('$path') should return false" );
+        }
+
+        /**
+         * @ticket 33265
+         */
+        function test_wp_normalize_path() {
+                $paths = array(
+                        '/WINDOWS' => '/WINDOWS',
+                        'C:/' => 'C:/',
+                        'C:/WINDOWS' => 'C:/WINDOWS',
+                        'C:/WINDOWS/system32' => 'C:/WINDOWS/system32',
+                        '\\WINDOWS' => '/WINDOWS',
+                        'C:\\' => 'C:/',
+                        'C:\\WINDOWS' => 'C:/WINDOWS',
+                        'C:\\\\WINDOWS' => 'C:/WINDOWS',
+                        'C:\\WINDOWS\\system32' => 'C:/WINDOWS/system32',
+                        '\\\\sambashare\\foo' => '/sambashare/foo',
+                        'c:/windows' => 'C:/windows',
+                        'c:\\windows' => 'C:/windows',
+                );
+
+                foreach ($paths as $original => $expected) {
+                        $this->assertEquals( $expected, wp_normalize_path( $original ) );
+                }
         }