Changeset 37810

Timestamp:

06/21/2016 02:51:38 PM (10 years ago)

Author:

joemcgill

Message:

Media: Improve handling of extensionless filenames.

Merge of [37756] to the 4.4 branch.

See #37111.

Location:

branches/4.4

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/SanitizeFileName.php (modified) (1 diff)

branches/4.4/src/wp-includes/formatting.php

@@ -1365 +1365 @@
  * to manipulate at the command line. Replaces spaces and consecutive
  * dashes with a single dash. Trims period, dash and underscore from beginning
- * and end of filename.
+ * and end of filename. It is not guaranteed that this function will return a
+ * filename that is allowed to be uploaded.
  *
  * @since 2.1.0
@@ -1389 +1390 @@
         $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
         $filename = trim( $filename, '.-_' );
+
+        if ( false === strpos( $filename, '.' ) ) {
+                $mime_types = wp_get_mime_types();
+                $filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
+                if ( $filetype['ext'] === $filename ) {
+                        $filename = 'unnamed-file.' . $filetype['ext'];
+                }
+        }
 
         // Split the filename into a base and extension[s]

branches/4.4/tests/phpunit/tests/formatting/SanitizeFileName.php

@@ -57 +57 @@
                 $this->assertEquals( 'a22b.jpg', sanitize_file_name( 'a%22b.jpg' ) );
         }
+
+        function test_replaces_unnammed_file_extensions() {
+                // Test filenames with both supported and unsupported extensions.
+                $this->assertEquals( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );
+                $this->assertEquals( 'unnamed-file.jpg', sanitize_file_name( '_.jpg' ) );
+        }
+
+        function test_replaces_unnammed_file_extensionless() {
+                // Test a filenames that becomes extensionless.
+                $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) );
+        }
 }