Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
Signed-off-by: Bjarke Berg <mail@bergmania.dk> # Conflicts: # src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs # src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs # src/Umbraco.Web.UI/web.Template.Debug.config # src/Umbraco.Web/Compose/AuditEventsComponent.cs # src/Umbraco.Web/HtmlHelperRenderExtensions.cs # src/Umbraco.Web/HtmlStringUtilities.cs # src/Umbraco.Web/PublishedContentExtensions.cs # src/Umbraco.Web/Runtime/WebInitialComposer.cs
This commit is contained in:
@@ -30,9 +30,6 @@ namespace Umbraco.Web.ContentApps
|
||||
Weight = Weight
|
||||
});
|
||||
|
||||
case IContent _:
|
||||
return null;
|
||||
|
||||
case IMedia media when !media.ContentType.IsContainer || media.Properties.Count > 0:
|
||||
return _mediaApp ?? (_mediaApp = new ContentApp
|
||||
{
|
||||
@@ -43,9 +40,6 @@ namespace Umbraco.Web.ContentApps
|
||||
Weight = Weight
|
||||
});
|
||||
|
||||
case IMedia _:
|
||||
return null;
|
||||
|
||||
case IMember _:
|
||||
return _memberApp ?? (_memberApp = new ContentApp
|
||||
{
|
||||
@@ -57,7 +51,7 @@ namespace Umbraco.Web.ContentApps
|
||||
});
|
||||
|
||||
default:
|
||||
throw new NotSupportedException($"Object type {o.GetType()} is not supported here.");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user