Changeset 30640

Timestamp:

11/30/2014 06:32:16 AM (12 years ago)

Author:

wonderboymusic

Message:

Adjust the RegEx in wp_check_filetype() to be aware that query strings are thing that exist sometimes in URLs.

Adds unit tests.

Props voldemortensen.
Fixes #30377.

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

@@ -2050 +2050 @@
 
         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

@@ -468 +468 @@
         }
 
+        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 );
+        }
 }