Changeset 32171

Timestamp:

04/20/2015 06:38:08 AM (10 years ago)

Author:

pento

Message:

Revert [30640], as it was incorrectly checking some filenames.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -2054 +2054 @@
 
     foreach ( $mimes as $ext_preg => $mime_match ) {
-        $ext_preg = '!\.(' . $ext_preg . ')(\?.*)?$!i';
+        $ext_preg = '!\.(' . $ext_preg . ')$!i';
         if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
             $type = $mime_match;

trunk/tests/phpunit/tests/media.php

@@ -532 +532 @@
     }
 
-    function test_wp_check_filetype() {
-        $url = 'http://example.com/testFile.mp4?autoplay=true&otherstuff=false';
-        $filetype = wp_check_filetype( $url );
-        $expected = array(
-            'ext'  => 'mp4',
-            'type' => 'video/mp4'
-        );
-        $this->assertEquals( $expected, $filetype );
-    }
-
     /**
      * @ticket 22768