WordPress.org

Make WordPress Core

Changeset 37818


Ignore:
Timestamp:
06/21/2016 02:56:43 PM (4 years ago)
Author:
joemcgill
Message:

Media: Improve handling of extensionless filenames.

Merge of [37756] to the 4.1 branch.

See #37111.

Location:
branches/4.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/src/wp-includes/formatting.php

    r33521 r37818  
    11561156 * to manipulate at the command line. Replaces spaces and consecutive
    11571157 * dashes with a single dash. Trims period, dash and underscore from beginning
    1158  * and end of filename.
     1158 * and end of filename. It is not guaranteed that this function will return a
     1159 * filename that is allowed to be uploaded.
    11591160 *
    11601161 * @since 2.1.0
     
    11801181    $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
    11811182    $filename = trim( $filename, '.-_' );
     1183
     1184    if ( false === strpos( $filename, '.' ) ) {
     1185        $mime_types = wp_get_mime_types();
     1186        $filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
     1187        if ( $filetype['ext'] === $filename ) {
     1188            $filename = 'unnamed-file.' . $filetype['ext'];
     1189        }
     1190    }
    11821191
    11831192    // Split the filename into a base and extension[s]
  • branches/4.1/tests/phpunit/tests/formatting/SanitizeFileName.php

    r29290 r37818  
    5050        $this->assertEquals("a-t", sanitize_file_name("a    \n\n\nt"));
    5151    }
     52
     53    function test_replaces_unnammed_file_extensions() {
     54        // Test filenames with both supported and unsupported extensions.
     55        $this->assertEquals( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );
     56        $this->assertEquals( 'unnamed-file.jpg', sanitize_file_name( '_.jpg' ) );
     57    }
     58
     59    function test_replaces_unnammed_file_extensionless() {
     60        // Test a filenames that becomes extensionless.
     61        $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) );
     62    }
    5263}
Note: See TracChangeset for help on using the changeset viewer.