From cf81f9b706444db8571fa878ae3ecffffdcc8028 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 5 Feb 2021 19:48:44 +0100 Subject: [PATCH] Fallback for getting the current published content in UmbracoHelper --- .../AspNetCore/UmbracoViewPage.cs | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs b/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs index 74b40403f0..23ae7d7f32 100644 --- a/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs +++ b/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs @@ -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(); - if (content != null) + if (!(content is null)) + { _helper.AssignedContentItem = content; + } return _helper; }