Ticket #36308: 36308.4.diff

src/wp-includes/functions.php

@@ -1715 +1715 @@
  * For example, '/foo/bar', or 'c:\windows'.
  *
  * @since 2.5.0
+ * @since 5.0.0 Allows Windows normalized paths (forward slashes).
  *
  * @param string $path File path.
  * @return bool True if path is absolute, false is not absolute.
@@ -1737 +1738 @@
                 return true;
         }
 
+        // Windows normalized paths for local filesystem and network shares (forward slashes).
+        if ( preg_match( '#(^[a-zA-Z]+:/|^//[\w!@\#\$%\^\(\)\-\'{}\.~]{1,15})#', $path ) ) {
+                return true;
+        }
+
         // A path starting with / or \ is absolute; anything else is relative.
         return ( $path[0] == '/' || $path[0] == '\\' );
 }

src/wp-includes/post.php

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

tests/phpunit/tests/functions.php

@@ -101 +101 @@
                         'C:\\',
                         '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 ) {
                         $this->assertTrue( path_is_absolute( $path ), "path_is_absolute('$path') should return true" );
@@ -115 +122 @@
                         '../foo',
                         '../',
                         '../foo.bar',
+                        'foo.bar',
                         'foo/bar',
                         'foo',
                         'FOO',
                         '..\\WINDOWS',
+                        '..//WINDOWS',
+                        'c:',
+                        'C:',
                 );
                 foreach ( $relative_paths as $path ) {
                         $this->assertFalse( path_is_absolute( $path ), "path_is_absolute('$path') should return false" );

tests/phpunit/tests/post.php

@@ -1354 +1354 @@
                 $this->assertEquals( $changeset_data, json_decode( get_post( $post_id )->post_content, true ) );
         }
 
+        /**
+         * Testing the wp_get_attached_file() function.
+         *
+         * @ticket 36308
+         */
+        public function test_wp_get_attached_file() {
+
+                $post = self::factory()->post->create_and_get(
+                        array(
+                                'post_title' => 'example-page',
+                                'post_type'  => 'post',
+                        )
+                );
+
+                // Windows local file system path.
+                $attachment      = self::factory()->attachment->create_and_get(
+                        array(
+                                'post_parent' => $post->ID,
+                                'file'        => 'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg',
+                        )
+                );
+                $attachment_path = get_attached_file( $attachment->ID );
+                $this->assertEquals( $attachment_path, 'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg' );
+
+                // Windows network shares path.
+                $attachment      = self::factory()->attachment->create_and_get(
+                        array(
+                                'post_parent' => $post->ID,
+                                'file'        => '//ComputerName/ShareName/SubfolderName/example.txt',
+                        )
+                );
+                $attachment_path = get_attached_file( $attachment->ID );
+                $this->assertEquals( $attachment_path, '//ComputerName/ShareName/SubfolderName/example.txt' );
+        }
+
 }