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

Merge branch 'dev-v7' into temp-U4-7178-media-library

Browse Source 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
This commit is contained in:
Mads Rasmussen
2015-10-19 16:59:10 +02:00
parent 75970e9a83 51c9d64dad
commit 3e3ba0ebb7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Editors/MediaTypeController.cs
View File

@@ -176,7 +176,7 @@ namespace Umbraco.Web.Editors
}
else
{
var contentItem = Services.ContentService.GetById(contentId);
var contentItem = Services.MediaService.GetById(contentId);
if (contentItem == null)
{
return Enumerable.Empty<ContentTypeBasic>();