From 080f4331402dca888c4867d774d79abfd1640e6d Mon Sep 17 00:00:00 2001 From: Brandon Osborne Date: Sat, 23 Mar 2019 03:59:04 -0500 Subject: [PATCH] Updated Upload method (#4850) --- src/Umbraco.Web/Editors/ContentTypeController.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index bf2ef62028..1f00b88b6d 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -552,9 +552,15 @@ namespace Umbraco.Web.Editors var file = result.FileData[0]; var fileName = file.Headers.ContentDisposition.FileName.Trim('\"'); var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower(); + + // renaming the file because MultipartFormDataStreamProvider has created a random fileName instead of using the name from the + // content-disposition for more than 6 years now. Creating a CustomMultipartDataStreamProvider deriving from MultipartFormDataStreamProvider + // seems like a cleaner option, but I'm not sure where to put it and renaming only takes one line of code. + System.IO.File.Move(result.FileData[0].LocalFileName, root + "\\" + fileName); + if (ext.InvariantEquals("udt")) { - model.TempFileName = Path.Combine(root, model.TempFileName); + model.TempFileName = Path.Combine(root, fileName); model.UploadedFiles.Add(new ContentPropertyFile {