WordPress.org

Make WordPress Core

Changeset 37825


Ignore:
Timestamp:
06/21/2016 03:01:26 PM (5 years ago)
Author:
joemcgill
Message:

Media: Improve handling of extensionless filenames.

Merge of [37756] to the 3.7 branch.

See #37111.

Location:
branches/3.7
Files:
2 edited

Legend:

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

    r33525 r37825  
    946946 * to manipulate at the command line. Replaces spaces and consecutive
    947947 * dashes with a single dash. Trims period, dash and underscore from beginning
    948  * and end of filename.
     948 * and end of filename. It is not guaranteed that this function will return a
     949 * filename that is allowed to be uploaded.
    949950 *
    950951 * @since 2.1.0
     
    960961    $filename = preg_replace('/[\s-]+/', '-', $filename);
    961962    $filename = trim($filename, '.-_');
     963
     964    if ( false === strpos( $filename, '.' ) ) {
     965        $mime_types = wp_get_mime_types();
     966        $filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
     967        if ( $filetype['ext'] === $filename ) {
     968            $filename = 'unnamed-file.' . $filetype['ext'];
     969        }
     970    }
    962971
    963972    // Split the filename into a base and extension[s]
  • branches/3.7/tests/phpunit/tests/formatting/SanitizeFileName.php

    r25002 r37825  
    3232        $this->assertEquals("a-t", sanitize_file_name("a    \n\n\nt"));
    3333    }
     34
     35    function test_replaces_unnammed_file_extensions() {
     36        // Test filenames with both supported and unsupported extensions.
     37        $this->assertEquals( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );
     38        $this->assertEquals( 'unnamed-file.jpg', sanitize_file_name( '_.jpg' ) );
     39    }
     40
     41    function test_replaces_unnammed_file_extensionless() {
     42        // Test a filenames that becomes extensionless.
     43        $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) );
     44    }
    3445}
Note: See TracChangeset for help on using the changeset viewer.