diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 522da20c9c..3b037fa6f0 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -28,163 +28,162 @@
-True
-
-
-
+
-
- 1
- 1079
- 1080
-
-
-
-
- your@email.here
-
+
+ 1
+ 1079
+ 1080
+
+
+
+
+ your@email.here
+
-
-True
+
+ True
-
-False
+
+ False
-
-UTF8
+
+ UTF8
-
-false
+
+ false
-
-
-true
+
+
+ true
-
-True
+
+ True
-
-True
+
+ True
-
-False
+
+ False
-
-False
+
+ False
-
-text
+
+ text
-
-
- In Preview Mode - click to end
- ]]>
-
+
+
+ In Preview Mode - click to end
+ ]]>
-
-
-1800
+
+
+ 1800
-
-
-
-false
+
+
+
+ false
-
-throw
+ throw
+
+
+ ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess
-
-ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess
+
+ Textstring
+
+
-
-Textstring
+
+
+ true
-
+
+ false
+
+
+ true
+
+
-
-
-true
+
+
+ false
+
+ true
+
+ -
+
+
+
+
+
+
+
+
+
+ plus
+ star
+
+
+ ae
+ oe
+ aa
+ ae
+ oe
+ ue
+ ss
+ ae
+ oe
+ -
+
+
+
+
-
-false
+
+
+
+ true
-
-true
-
-
-
-
-
-false
-
-true
-
- -
-
-
-
-
-
-
-
-
-
- plus
- star
-
-
- ae
- oe
- aa
- ae
- oe
- ue
- ss
- ae
- oe
- -
-
-
-
-
-
-
-
-
-true
-
-
-
-Mvc
-
+
+
+ Mvc
+
-
-
-
- cs
- vb
-
-
+
+
+
+ cs
+ vb
+
+
-
-
-
-
- p
- div
- ul
- span
-
-
-
+
+ p
+ div
+ ul
+ span
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-true
-true
-
-
-
-
-
-
-
+
+ true
+ true
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-0
+
+
+
+
+ 0
-
-
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+ UsersMembershipProvider
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
- UsersMembershipProvider
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 189dda4934..c08de157b9 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -5,14 +5,14 @@ using System.Globalization;
using System.Linq;
using System.Web;
using Examine.LuceneEngine.SearchCriteria;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
using Umbraco.Core.Models;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Services;
using Umbraco.Web.Models;
-using Umbraco.Core;
using Umbraco.Web.Routing;
using ContentType = umbraco.cms.businesslogic.ContentType;
-using Umbraco.Core.Configuration;
namespace Umbraco.Web
{
diff --git a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs b/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
index 9ff3f25ae1..4732895311 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
@@ -12,8 +12,7 @@ namespace Umbraco.Web.Routing
public bool TryFindContent(PublishedContentRequest docRequest)
{
int pageId;
-
- if (int.TryParse(docRequest.RoutingContext.UmbracoContext.HttpContext.Request["umbPageID"], out pageId))
+ if (int.TryParse(docRequest.RoutingContext.UmbracoContext.HttpContext.Request["umbPageID"], out pageId))
{
var doc = docRequest.RoutingContext.UmbracoContext.ContentCache.GetById(pageId);
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
index 796ef9c1ce..4f40af4b59 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
using Umbraco.Core.Security;
using umbraco;
@@ -20,7 +21,6 @@ using umbraco.cms.businesslogic.member;
using Umbraco.Core.Services;
using Umbraco.Web.Security;
using RenderingEngine = Umbraco.Core.RenderingEngine;
-using Umbraco.Core.Models;
namespace Umbraco.Web.Routing
{
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 2eb00a9c75..d7d331d887 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -77,16 +77,16 @@ namespace Umbraco.Web.Templates
{
contentRequest.Culture = _umbracoContext.PublishedContentRequest.Culture;
}
-
- //set the doc that was found by id
- contentRequest.PublishedContent = doc;
- //set the template, either based on the AltTemplate found or the standard template of the doc
- contentRequest.TemplateModel = UmbracoConfig.For.UmbracoSettings().WebRouting.DisableAlternativeTemplates || AltTemplate.HasValue == false
+
+ //set the doc that was found by id
+ contentRequest.PublishedContent = doc;
+ //set the template, either based on the AltTemplate found or the standard template of the doc
+ contentRequest.TemplateModel = UmbracoConfig.For.UmbracoSettings().WebRouting.DisableAlternativeTemplates || AltTemplate.HasValue == false
? _umbracoContext.Application.Services.FileService.GetTemplate(doc.TemplateId)
: _umbracoContext.Application.Services.FileService.GetTemplate(AltTemplate.Value);
- //if there is not template then exit
- if (!contentRequest.HasTemplate)
+ //if there is not template then exit
+ if (!contentRequest.HasTemplate)
{
if (!AltTemplate.HasValue)
{
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index ed4254198e..e71a290754 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -153,27 +153,27 @@ namespace umbraco
{
populatePageData(node);
- if (UmbracoConfig.For.UmbracoSettings().WebRouting.DisableAlternativeTemplates == false)
- {
+ if (UmbracoConfig.For.UmbracoSettings().WebRouting.DisableAlternativeTemplates == false)
+ {
// Check for alternative template
- if (HttpContext.Current.Items[Constants.Conventions.Url.AltTemplate] != null &&
- HttpContext.Current.Items[Constants.Conventions.Url.AltTemplate].ToString() != String.Empty)
- {
- _template =
- umbraco.cms.businesslogic.template.Template.GetTemplateIdFromAlias(
- HttpContext.Current.Items[Constants.Conventions.Url.AltTemplate].ToString());
- _elements.Add("template", _template.ToString());
- }
- else if (helper.Request(Constants.Conventions.Url.AltTemplate) != String.Empty)
- {
- _template =
- umbraco.cms.businesslogic.template.Template.GetTemplateIdFromAlias(
- helper.Request(Constants.Conventions.Url.AltTemplate).ToLower());
- _elements.Add("template", _template.ToString());
- }
- }
+ if (HttpContext.Current.Items[Constants.Conventions.Url.AltTemplate] != null &&
+ HttpContext.Current.Items[Constants.Conventions.Url.AltTemplate].ToString() != String.Empty)
+ {
+ _template =
+ umbraco.cms.businesslogic.template.Template.GetTemplateIdFromAlias(
+ HttpContext.Current.Items[Constants.Conventions.Url.AltTemplate].ToString());
+ _elements.Add("template", _template.ToString());
+ }
+ else if (helper.Request(Constants.Conventions.Url.AltTemplate) != String.Empty)
+ {
+ _template =
+ umbraco.cms.businesslogic.template.Template.GetTemplateIdFromAlias(
+ helper.Request(Constants.Conventions.Url.AltTemplate).ToLower());
+ _elements.Add("template", _template.ToString());
+ }
+ }
- if (_template == 0)
+ if (_template == 0)
{
try
{