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

Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

Browse Source
This commit is contained in:
Shannon
2013-09-25 19:23:41 +10:00
parent f356b94c39
commit 1e9a17babe
125 changed files with 397 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
View File

@@ -532,7 +532,7 @@ namespace Umbraco.Web.Routing
// does not apply
// + optionnally, apply the alternate template on internal redirects
var useAltTemplate = _pcr.IsInitialPublishedContent
|| (UmbracoConfiguration.Current.UmbracoSettings.WebRouting.InternalRedirectPreservesTemplate && _pcr.IsInternalRedirectPublishedContent);
|| (UmbracoConfig.For.UmbracoSettings().WebRouting.InternalRedirectPreservesTemplate && _pcr.IsInternalRedirectPublishedContent);
string altTemplate = useAltTemplate
? _routingContext.UmbracoContext.HttpContext.Request[Constants.Conventions.Url.AltTemplate]
: null;