Changeset 54712

Timestamp:

10/28/2022 03:16:29 PM (4 years ago)

Author:

antpb

Message:

Media: Reverts get_attached_file() changes for normalized Windows paths.

Based on feedback from network storage configurations there was a noticed slowdown due to the usage of the path_join() function. This needs more time to find a workaround.

Follow-up to [53934].
Props mreishus, SergeyBiryukov, desrosj, mikeschroder.
Reverts [53934].
See #56924.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -2080 +2080 @@
  *
  * @since 2.5.0
- * @since 6.1.0 Allows normalized Windows paths (forward slashes).
  *
  * @param string $path File path.
@@ -2108 +2107 @@
         // Windows allows absolute paths like this.
         if ( preg_match( '#^[a-zA-Z]:\\\\#', $path ) ) {
-                return true;
-        }
-
-        // Normalized Windows paths for local filesystem and network shares (forward slashes).
-        if ( preg_match( '#(^[a-zA-Z]+:/|^//[\w!@\#\$%\^\(\)\-\'{}\.~]{1,15})#', $path ) ) {
                 return true;
         }

trunk/src/wp-includes/post.php

@@ -725 +725 @@
 
         // If the file is relative, prepend upload dir.
-        if ( $file ) {
+        if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) ) {
                 $uploads = wp_get_upload_dir();
-
                 if ( false === $uploads['error'] ) {
-                        $file = path_join( $uploads['basedir'], $file );
+                        $file = $uploads['basedir'] . "/$file";
                 }
         }

trunk/tests/phpunit/tests/functions.php

@@ -106 +106 @@
                         'C:\\WINDOWS',
                         '\\\\sambashare\\foo',
-                        'c:/',
-                        'c://',
-                        '//',
-                        'c:/FOO',
-                        '//FOO',
-                        'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg',
-                        '//ComputerName/ShareName/SubfolderName/example.txt',
                 );
                 foreach ( $absolute_paths as $path ) {
@@ -127 +120 @@
                         '../',
                         '../foo.bar',
-                        'foo.bar',
                         'foo/bar',
                         'foo',
                         'FOO',
                         '..\\WINDOWS',
-                        '..//WINDOWS',
-                        'c:',
-                        'C:',
                 );
                 foreach ( $relative_paths as $path ) {