Ticket #18412: 18412.3.diff

src/wp-admin/includes/file.php

@@ -318 +318 @@
         if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
                 return call_user_func($upload_error_handler, $file, $uploads['error'] );
 
-        $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
+        $filename = wp_unique_filename( $uploads['path'], urldecode( $file['name'] ), $unique_filename_callback );
 
         // Move the file to the uploads dir
         $new_file = $uploads['path'] . "/$filename";

src/wp-admin/includes/media.php

@@ -250 +250 @@
                         $time = $post->post_date;
         }
 
-        $name = $_FILES[$file_id]['name'];
+        $name = urldecode( $_FILES[$file_id]['name'] );
         $file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
 
         if ( isset($file['error']) )