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

changing media controller logic.

Browse Source
This commit is contained in:
Claus
2016-11-04 13:52:36 +01:00
parent 0441827578
commit a96f48d0a8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,17 +531,17 @@ namespace Umbraco.Web.Editors
{
var mediaType = Constants.Conventions.MediaTypes.File;
if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
if (result.FormData["contentTypeAlias"] == Constants.Conventions.MediaTypes.Image)
{
if (result.FormData.ContainsKey("contentTypeAlias"))
{
mediaType = result.FormData["contentTypeAlias"];
}
else
if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
{
mediaType = Constants.Conventions.MediaTypes.Image;
}
}
else
{
mediaType = result.FormData["contentTypeAlias"];
}
//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: