yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using the provided media type when uploading images, instead of using default Image media type.

Browse Source
This commit is contained in:
Claus
2016-11-03 10:41:06 +01:00
parent 85c2ec68ac
commit 0441827578
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/Editors/MediaController.cs
View File

@@ -532,7 +532,16 @@ namespace Umbraco.Web.Editors
var mediaType = Constants.Conventions.MediaTypes.File;
if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
mediaType = Constants.Conventions.MediaTypes.Image;
{
if (result.FormData.ContainsKey("contentTypeAlias"))
{
mediaType = result.FormData["contentTypeAlias"];
}
else
{
mediaType = Constants.Conventions.MediaTypes.Image;
}
}
//TODO: make the media item name "nice" since file names could be pretty ugly, we have
// string extensions to do much of this but we'll need: