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

Fallback for getting the current published content in UmbracoHelper

Browse Source
This commit is contained in:
Bjarke Berg
2021-02-05 19:48:44 +01:00
parent ed18fba786
commit cf81f9b706
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs
View File

@@ -51,17 +51,29 @@ namespace Umbraco.Web.Common.AspNetCore
{
get
{
if (_helper != null) return _helper;
if (_helper != null)
{
return _helper;
}
var model = ViewData.Model;
TModel model = ViewData.Model;
var content = model as IPublishedContent;
if (content == null && model is IContentModel)
content = ((IContentModel) model).Content;
if (content is null && model is IContentModel contentModel)
{
content = contentModel.Content;
}
if (content is null)
{
content = UmbracoContext?.PublishedRequest?.PublishedContent;
}
_helper = Context.RequestServices.GetRequiredService<UmbracoHelper>();
if (content != null)
if (!(content is null))
{
_helper.AssignedContentItem = content;
}
return _helper;
}