Ticket #18730: 18730.patch

wp-admin/includes/file.php

@@ -509 +509 @@
                 unlink( $tmpfname );
                 return $response;
         }
+        
+        // If no extension is given, add one based on the content-type header
+        $ext = pathinfo( $tmpfname, PATHINFO_EXTENSION );
+        if ( empty( $ext ) && !empty( $response['headers']['content-type'] ) ) {
+                $mimes = get_allowed_mime_types();
+                foreach ( (array) $mimes as $ext => $mime ) {
+                        if ( preg_match( '!^(' . $mime . ')$!i', $response['headers']['content-type']) ) {
+                                $ext = array_shift( explode( '|', $ext) );
+                                rename($tmpfname, "$tmpfname.$ext");
+                                $tmpfname .= ".$ext";
+                                break;
+                        }
+                }
+        }
 
         if ( 200 != wp_remote_retrieve_response_code( $response ) ){
                 unlink( $tmpfname );

wp-admin/includes/media.php

@@ -587 +587 @@
 
                 // Set variables for storage
                 // fix file filename for query strings
-                preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $file, $matches);
+                preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $tmp, $matches);
                 $file_array['name'] = basename($matches[0]);
                 $file_array['tmp_name'] = $tmp;