diff --git a/src/Orchard.Web/Core/SafeMode/Views/Shared/document.aspx b/src/Orchard.Web/Core/SafeMode/Views/Shared/document.aspx
index fbbd0f931..5f62a2fad 100644
--- a/src/Orchard.Web/Core/SafeMode/Views/Shared/document.aspx
+++ b/src/Orchard.Web/Core/SafeMode/Views/Shared/document.aspx
@@ -1,10 +1,10 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
-
+
- <%=Html.Title() %>
+ <%=Html.Title() %> - Safe Mode!
<% Html.RenderZone("metas"); %>
<% Html.RenderZone("styles"); %>
<% Html.RenderZone("scripts"); %>
diff --git a/src/Orchard/Mvc/ViewEngines/OrchardLayoutContext.cs b/src/Orchard/Mvc/ViewEngines/OrchardLayoutContext.cs
index a5e64718b..23ef272ed 100644
--- a/src/Orchard/Mvc/ViewEngines/OrchardLayoutContext.cs
+++ b/src/Orchard/Mvc/ViewEngines/OrchardLayoutContext.cs
@@ -13,7 +13,7 @@ namespace Orchard.Mvc.ViewEngines {
}
public static OrchardLayoutContext From(HttpContextBase context) {
- if (context.Items.Contains(_key)) {
+ if (!context.Items.Contains(_key)) {
context.Items.Add(_key, new OrchardLayoutContext());
}
return (OrchardLayoutContext)context.Items[_key];
diff --git a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs b/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
index b96f9ecfc..884dddba7 100644
--- a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
+++ b/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
@@ -30,12 +30,14 @@ namespace Orchard.Mvc.ViewEngines {
// enable /Views/Shared/"EditorTemplates/+{templateName}
viewEngine.PartialViewLocationFormats = new[] {
parameters.VirtualPath + "/Views/Shared/{0}.ascx",
+ parameters.VirtualPath + "/Views/Shared/{0}.aspx",
};
// for "routed" request views...
// enable /Views/{area}/{controller}/{viewName}
viewEngine.AreaPartialViewLocationFormats = new[] {
parameters.VirtualPath + "/Views/{2}/{1}/{0}.ascx",
+ parameters.VirtualPath + "/Views/{2}/{1}/{0}.aspx",
};
return viewEngine;