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

Port v7@2aa0dfb2c5 - WIP

Browse Source
This commit is contained in:
Stephan
2018-03-27 16:18:51 +02:00
parent d40a835701
commit c2e1ba21b2
80 changed files with 8951 additions and 4462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Mvc/RenderRouteHandler.cs
View File

@@ -13,6 +13,7 @@ using Umbraco.Web.Routing;
using System.Collections.Generic;
using Current = Umbraco.Web.Composing.Current;
using LightInject;
using Umbraco.Web.Features;
namespace Umbraco.Web.Mvc
{
@@ -49,6 +50,8 @@ namespace Umbraco.Web.Mvc
private UmbracoContext UmbracoContext => _umbracoContext ?? _umbracoContextAccessor.UmbracoContext;
private UmbracoFeatures Features => Current.Container.GetInstance<UmbracoFeatures>(); // fixme inject
#region IRouteHandler Members
/// <summary>
@@ -389,8 +392,8 @@ namespace Umbraco.Web.Mvc
}
//here we need to check if there is no hijacked route and no template assigned, if this is the case
//we want to return a blank page, but we'll leave that up to the NoTemplateHandler.
if (!request.HasTemplate && !routeDef.HasHijackedRoute && !_features.Enabled.RenderNoTemplate)
//we want to return a blank page, but we'll leave that up to the NoTemplateHandler.
if (!request.HasTemplate && !routeDef.HasHijackedRoute && !Features.Enabled.RenderNoTemplate)
{
// fixme - better find a way to inject that engine? or at least Current.Engine of some sort!
var engine = Core.Composing.Current.Container.GetInstance<PublishedRouter>();