WordPress.org

Make WordPress Core

Changeset 32172


Ignore:
Timestamp:
04/20/15 06:43:28 (3 years ago)
Author:
pento
Message:

Revert [30640], as it was incorrectly checking some filenames. This merges [32171] in the 4.1 branch.

See #30377.

Location:
branches/4.1
Files:
2 edited

Legend:

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

    r30674 r32172  
    20502050 
    20512051    foreach ( $mimes as $ext_preg => $mime_match ) { 
    2052         $ext_preg = '!\.(' . $ext_preg . ')(\?.*)?$!i'; 
     2052        $ext_preg = '!\.(' . $ext_preg . ')$!i'; 
    20532053        if ( preg_match( $ext_preg, $filename, $ext_matches ) ) { 
    20542054            $type = $mime_match; 
  • branches/4.1/tests/phpunit/tests/media.php

    r30640 r32172  
    468468    } 
    469469 
    470     function test_wp_check_filetype() { 
    471         $url = 'http://example.com/testFile.mp4?autoplay=true&otherstuff=false'; 
    472         $filetype = wp_check_filetype( $url ); 
    473         $expected = array( 
    474             'ext'  => 'mp4', 
    475             'type' => 'video/mp4' 
    476         ); 
    477         $this->assertEquals( $expected, $filetype ); 
    478     } 
    479470} 
Note: See TracChangeset for help on using the changeset viewer.