Changeset 16632

Timestamp:

11/30/2010 08:44:08 PM (14 years ago)

Author:

nacin

Message:

Ensure we don't generate incorrect content types when files are requested with query strings. props chrisbliss18. fixes #14450 for the 3.0 branch.

File:

• branches/3.0/wp-includes/ms-files.php (modified) (2 diffs)

branches/3.0/wp-includes/ms-files.php

@@ -30 +30 @@
 }
 
-$mime = wp_check_filetype( $_SERVER[ 'REQUEST_URI' ] );
+$mime = wp_check_filetype( $file );
 if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
     $mime[ 'type' ] = mime_content_type( $file );
@@ -37 +37 @@
     $mimetype = $mime[ 'type' ];
 else
-    $mimetype = 'image/' . substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 );
+    $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
 
 header( 'Content-type: ' . $mimetype ); // always send this