diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs index 91627edb8b..abeaa8542a 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs @@ -40,9 +40,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [ConfigurationProperty("XmlContentCheckForDiskChanges")] internal InnerTextConfigurationElement XmlContentCheckForDiskChanges => GetOptionalTextElement("XmlContentCheckForDiskChanges", false); - [ConfigurationProperty("EnableSplashWhileLoading")] - internal InnerTextConfigurationElement EnableSplashWhileLoading => GetOptionalTextElement("EnableSplashWhileLoading", false); - [ConfigurationProperty("PropertyContextHelpOption")] internal InnerTextConfigurationElement PropertyContextHelpOption => GetOptionalTextElement("PropertyContextHelpOption", "text"); @@ -110,8 +107,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings bool IContentSection.XmlContentCheckForDiskChanges => XmlContentCheckForDiskChanges; - bool IContentSection.EnableSplashWhileLoading => EnableSplashWhileLoading; - string IContentSection.PropertyContextHelpOption => PropertyContextHelpOption; bool IContentSection.ForceSafeAliases => ForceSafeAliases; diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs index fe2eea5d91..00dc7f073d 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs @@ -35,8 +35,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings bool XmlContentCheckForDiskChanges { get; } - bool EnableSplashWhileLoading { get; } - string PropertyContextHelpOption { get; } bool ForceSafeAliases { get; } @@ -67,4 +65,4 @@ namespace Umbraco.Core.Configuration.UmbracoSettings string LoginBackgroundImage { get; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Core/RenderingEngine.cs b/src/Umbraco.Core/RenderingEngine.cs deleted file mode 100644 index ac1c9dce56..0000000000 --- a/src/Umbraco.Core/RenderingEngine.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Umbraco.Core -{ - public enum RenderingEngine - { - Unknown, - Mvc, - WebForms - } -} diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index fb54e4a4f4..588c66cd3d 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -1308,7 +1308,6 @@ - diff --git a/src/Umbraco.Tests/Cache/AppCacheTests.cs b/src/Umbraco.Tests/Cache/AppCacheTests.cs index 29d61cc14a..3a86feb90a 100644 --- a/src/Umbraco.Tests/Cache/AppCacheTests.cs +++ b/src/Umbraco.Tests/Cache/AppCacheTests.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Web.UI; using NUnit.Framework; using Umbraco.Core.Cache; -using umbraco; namespace Umbraco.Tests.Cache { @@ -104,9 +103,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Get_By_Search() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("Test1", () => cacheContent1); AppCache.Get("Tester2", () => cacheContent2); @@ -123,9 +122,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Clear_By_Expression() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("TTes1t", () => cacheContent1); AppCache.Get("Tester2", () => cacheContent2); @@ -142,9 +141,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Clear_By_Search() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("Test1", () => cacheContent1); AppCache.Get("Tester2", () => cacheContent2); @@ -161,9 +160,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Clear_By_Key() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("Test1", () => cacheContent1); AppCache.Get("Test2", () => cacheContent2); @@ -181,9 +180,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Clear_All_Items() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("Test1", () => cacheContent1); AppCache.Get("Test2", () => cacheContent2); @@ -200,7 +199,7 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Add_When_Not_Available() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); + var cacheContent1 = new MacroCacheContent(); AppCache.Get("Test1", () => cacheContent1); Assert.AreEqual(1, GetTotalItemCount); } @@ -208,7 +207,7 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Get_When_Available() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); + var cacheContent1 = new MacroCacheContent(); var result = AppCache.Get("Test1", () => cacheContent1); var result2 = AppCache.Get("Test1", () => cacheContent1); Assert.AreEqual(1, GetTotalItemCount); @@ -218,9 +217,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Remove_By_Type_Name() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("Test1", () => cacheContent1); AppCache.Get("Test2", () => cacheContent2); @@ -238,9 +237,9 @@ namespace Umbraco.Tests.Cache [Test] public void Can_Remove_By_Strong_Type() { - var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1"); - var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2"); - var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3"); + var cacheContent1 = new MacroCacheContent(); + var cacheContent2 = new MacroCacheContent(); + var cacheContent3 = new MacroCacheContent(); var cacheContent4 = new LiteralControl(); AppCache.Get("Test1", () => cacheContent1); AppCache.Get("Test2", () => cacheContent2); @@ -253,5 +252,10 @@ namespace Umbraco.Tests.Cache Assert.AreEqual(1, GetTotalItemCount); } + + //just used for these tests + private class MacroCacheContent + { + } } } diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs index 962d6d13a9..d1b86c6c37 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs @@ -130,11 +130,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings { Assert.IsTrue(SettingsSection.Content.XmlContentCheckForDiskChanges); } - [Test] - public void EnableSplashWhileLoading() - { - Assert.IsFalse(SettingsSection.Content.EnableSplashWhileLoading); - } + [Test] public void PropertyContextHelpOption() { diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 569f5382e8..71e3836b3d 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -97,7 +97,6 @@ namespace Umbraco.Tests.Routing var frequest = publishedRouter.CreateRequest(umbracoContext); frequest.PublishedContent = umbracoContext.ContentCache.GetById(1174); frequest.TemplateModel = template; - frequest.RenderingEngine = RenderingEngine.Mvc; var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContext, Mock.Of())); diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index f05a7b4eed..5e61de2132 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -206,15 +206,6 @@ tinyMceConfig.config Designer - - scripting.config - - - Dashboard.config - Designer - - feedProxy.config - @@ -249,7 +240,6 @@ Designer - @@ -307,10 +297,6 @@ Designer - - Designer - - Designer diff --git a/src/Umbraco.Web.UI/config/scripting.Release.config b/src/Umbraco.Web.UI/config/scripting.Release.config deleted file mode 100644 index 085856c52e..0000000000 --- a/src/Umbraco.Web.UI/config/scripting.Release.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/scripting.config b/src/Umbraco.Web.UI/config/scripting.config deleted file mode 100644 index 085856c52e..0000000000 --- a/src/Umbraco.Web.UI/config/scripting.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index e7399f600b..ab6e9258b9 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -8,7 +8,6 @@ --> -
@@ -30,7 +29,6 @@ - diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs index 99a1e6c803..e4d2c2e4da 100644 --- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs @@ -102,8 +102,7 @@ namespace Umbraco.Web.Cache if (payloads.Any(x => x.ChangeTypes.HasType(TreeChangeTypes.RefreshAll)) || publishedChanged) { // when a public version changes - Current.AppCaches.ClearPartialViewCache(); - MacroCacheRefresher.ClearMacroContentCache(AppCaches); // just the content + AppCaches.ClearPartialViewCache(); } base.Refresh(payloads); @@ -160,7 +159,6 @@ namespace Umbraco.Web.Cache // simple for now, just clear the whole thing appCaches.ClearPartialViewCache(); - MacroCacheRefresher.ClearMacroContentCache(appCaches); // just the content appCaches.IsolatedCaches.ClearCache(); appCaches.IsolatedCaches.ClearCache(); diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs index b224a07151..741604ee81 100644 --- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs @@ -37,9 +37,6 @@ namespace Umbraco.Web.Cache ClearAllIsolatedCacheByEntityType(); - //TODO: WB Was I too aggresive with cleanup? - AppCaches.RuntimeCache.ClearOfType(); - base.RefreshAll(); } @@ -111,12 +108,6 @@ namespace Umbraco.Web.Cache return GetAllMacroCacheKeys().Select(x => x + alias).ToArray(); } - public static void ClearMacroContentCache(AppCaches appCaches) - { - //TODO: WB Was I too aggresive with cleanup? - appCaches.RuntimeCache.ClearOfType(); - } - #endregion } } diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs index 91a966cef7..8ae59b974c 100644 --- a/src/Umbraco.Web/Editors/DashboardController.cs +++ b/src/Umbraco.Web/Editors/DashboardController.cs @@ -154,11 +154,7 @@ namespace Umbraco.Web.Editors break; default: - //Throw error - return new HttpResponseMessage(HttpStatusCode.Unauthorized) - { - Content = new StringContent($"The Site {site} and {url} is not on the whitelist"), - }; + return new HttpResponseMessage(HttpStatusCode.NotFound); } diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 48284769ec..4cd7e3b0e0 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -347,9 +347,6 @@ namespace Umbraco.Web.Mvc // to Mvc since Mvc can't do much return new PublishedContentNotFoundHandler("In addition, no template exists to render the custom 404."); - if (request.RenderingEngine != RenderingEngine.Mvc) // else ? - return new PublishedContentNotFoundHandler("In addition, no rendering engine exists to render the custom 404."); - return null; } diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs index 96aa7f9039..ea832e1352 100644 --- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs +++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs @@ -30,24 +30,21 @@ namespace Umbraco.Web.Mvc var routeDef = (RouteDefinition)context.RouteData.DataTokens[Umbraco.Core.Constants.Web.UmbracoRouteDefinitionDataToken]; - if (routeDef.PublishedRequest.RenderingEngine == RenderingEngine.Mvc) + var factory = ControllerBuilder.Current.GetControllerFactory(); + context.RouteData.Values["action"] = routeDef.ActionName; + ControllerBase controller = null; + + try { - var factory = ControllerBuilder.Current.GetControllerFactory(); - context.RouteData.Values["action"] = routeDef.ActionName; - ControllerBase controller = null; + controller = CreateController(context, factory, routeDef); - try - { - controller = CreateController(context, factory, routeDef); + CopyControllerData(context, controller); - CopyControllerData(context, controller); - - ExecuteControllerAction(context, controller); - } - finally - { - CleanupController(controller, factory); - } + ExecuteControllerAction(context, controller); + } + finally + { + CleanupController(controller, factory); } } diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs index cccc89074d..9a775adb85 100644 --- a/src/Umbraco.Web/Routing/PublishedRequest.cs +++ b/src/Umbraco.Web/Routing/PublishedRequest.cs @@ -6,10 +6,8 @@ using System.Web; using umbraco; using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; -using RenderingEngine = Umbraco.Core.RenderingEngine; namespace Umbraco.Web.Routing { @@ -24,7 +22,6 @@ namespace Umbraco.Web.Routing private bool _readonly; // after prepared private bool _readonlyUri; // after preparing private Uri _uri; // clean uri, no virtual dir, no trailing slash nor .aspx, nothing - private ITemplate _template; // template model if any else null private bool _is404; private DomainAndUri _domain; private CultureInfo _culture; @@ -43,7 +40,6 @@ namespace Umbraco.Web.Routing UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext)); _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter)); Uri = uri ?? umbracoContext.CleanedUmbracoUrl; - RenderingEngine = RenderingEngine.Unknown; } /// @@ -174,8 +170,7 @@ namespace Umbraco.Web.Routing // else // save - var template = _template; - var renderingEngine = RenderingEngine; + var template = TemplateModel; // set published content - this resets the template, and sets IsInternalRedirect to false PublishedContent = content; @@ -185,8 +180,7 @@ namespace Umbraco.Web.Routing if (isInternalRedirect && Current.Configs.Settings().WebRouting.InternalRedirectPreservesTemplate) { // restore - _template = template; - RenderingEngine = renderingEngine; + TemplateModel = template; } } @@ -234,26 +228,12 @@ namespace Umbraco.Web.Routing /// /// Gets or sets the template model to use to display the requested content. /// - internal ITemplate TemplateModel - { - get - { - return _template; - } - - set - { - _template = value; - RenderingEngine = RenderingEngine.Unknown; // reset - if (_template != null) - RenderingEngine = _publishedRouter.FindTemplateRenderingEngine(_template.Alias); - } - } + internal ITemplate TemplateModel { get; set; } /// /// Gets the alias of the template to use to display the requested content. /// - public string TemplateAlias => _template?.Alias; + public string TemplateAlias => TemplateModel?.Alias; /// /// Tries to set the template to use to display the requested content. @@ -309,7 +289,7 @@ namespace Umbraco.Web.Routing /// /// Gets a value indicating whether the content request has a template. /// - public bool HasTemplate => _template != null; + public bool HasTemplate => TemplateModel != null; internal void UpdateOnMissingTemplate() { @@ -361,15 +341,6 @@ namespace Umbraco.Web.Routing #endregion - #region Rendering - - /// - /// Gets or sets whether the rendering engine is MVC or WebForms. - /// - public RenderingEngine RenderingEngine { get; internal set; } - - #endregion - #region Status /// diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs index 63def7a1cd..7ffb01e7f6 100644 --- a/src/Umbraco.Web/Routing/PublishedRouter.cs +++ b/src/Umbraco.Web/Routing/PublishedRouter.cs @@ -15,7 +15,6 @@ using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Web.Security; -using RenderingEngine = Umbraco.Core.RenderingEngine; namespace Umbraco.Web.Routing { @@ -365,29 +364,6 @@ namespace Umbraco.Web.Routing #region Rendering engine - /// - /// Finds the rendering engine to use to render a template specified by its alias. - /// - /// The alias of the template. - /// The rendering engine, or Unknown if the template was not found. - internal RenderingEngine FindTemplateRenderingEngine(string alias) - { - if (string.IsNullOrWhiteSpace(alias)) - return RenderingEngine.Unknown; - - alias = alias.Replace('\\', '/'); // forward slashes only - - // NOTE: we could start with what's the current default? - - // TODO: bad - we probably should be using the appropriate filesystems! - - if (FindTemplateRenderingEngineInDirectory(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.MvcViews)), - alias, new[] { ".cshtml", ".vbhtml" })) - return RenderingEngine.Mvc; - - return RenderingEngine.Unknown; - } - internal bool FindTemplateRenderingEngineInDirectory(DirectoryInfo directory, string alias, string[] extensions) { if (directory == null || directory.Exists == false) diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index 686f8e21e2..24526de7b2 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -136,31 +136,22 @@ namespace Umbraco.Web.Templates //var queryString = _umbracoContext.HttpContext.Request.QueryString.AllKeys // .ToDictionary(key => key, key => context.Request.QueryString[key]); - switch (request.RenderingEngine) + var requestContext = new RequestContext(_umbracoContext.HttpContext, new RouteData() { - case RenderingEngine.Mvc: - var requestContext = new RequestContext(_umbracoContext.HttpContext, new RouteData() - { - Route = RouteTable.Routes["Umbraco_default"] - }); - var routeHandler = new RenderRouteHandler(_umbracoContext, ControllerBuilder.Current.GetControllerFactory()); - var routeDef = routeHandler.GetUmbracoRouteDefinition(requestContext, request); - var renderModel = new ContentModel(request.PublishedContent); - //manually add the action/controller, this is required by mvc - requestContext.RouteData.Values.Add("action", routeDef.ActionName); - requestContext.RouteData.Values.Add("controller", routeDef.ControllerName); - //add the rest of the required route data - routeHandler.SetupRouteDataForRequest(renderModel, requestContext, request); + Route = RouteTable.Routes["Umbraco_default"] + }); + var routeHandler = new RenderRouteHandler(_umbracoContext, ControllerBuilder.Current.GetControllerFactory()); + var routeDef = routeHandler.GetUmbracoRouteDefinition(requestContext, request); + var renderModel = new ContentModel(request.PublishedContent); + //manually add the action/controller, this is required by mvc + requestContext.RouteData.Values.Add("action", routeDef.ActionName); + requestContext.RouteData.Values.Add("controller", routeDef.ControllerName); + //add the rest of the required route data + routeHandler.SetupRouteDataForRequest(renderModel, requestContext, request); - var stringOutput = RenderUmbracoRequestToString(requestContext); - - sw.Write(stringOutput); - break; - case RenderingEngine.WebForms: - default: - throw new Exception("We no longer support WebForms in Umbraco"); - } + var stringOutput = RenderUmbracoRequestToString(requestContext); + sw.Write(stringOutput); } /// diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 2d30c27c27..c3d3707fd3 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -261,7 +261,6 @@ - diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs index 9c413402b8..cc17d32752 100644 --- a/src/Umbraco.Web/UmbracoInjectedModule.cs +++ b/src/Umbraco.Web/UmbracoInjectedModule.cs @@ -270,12 +270,12 @@ namespace Umbraco.Web ReportRuntime(level, "Umbraco is booting."); // let requests pile up and wait for 10s then show the splash anyway - if (Current.Configs.Settings().Content.EnableSplashWhileLoading == false - && ((RuntimeState) _runtime).WaitForRunLevel(TimeSpan.FromSeconds(10))) return true; + //fixme: Do we want this for some insane reason? no other site in history has this + if (((RuntimeState) _runtime).WaitForRunLevel(TimeSpan.FromSeconds(10))) return true; // redirect to booting page httpContext.Response.StatusCode = 503; // temp not available - const string bootUrl = "~/config/splashes/booting.aspx"; + const string bootUrl = "~/config/splashes/booting.aspx"; //fixme: remove booting.aspx once the above question is resolved httpContext.Response.AddHeader("Retry-After", debug ? "1" : "30"); // seconds httpContext.RewritePath(UriUtility.ToAbsolute(bootUrl) + "?url=" + HttpUtility.UrlEncode(uri.ToString())); return false; // cannot serve content diff --git a/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs b/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs deleted file mode 100644 index 38fa4deca8..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Web.UI; - -namespace umbraco -{ - public class MacroCacheContent - { - private readonly Control _control; - private readonly string _id; - - [Obsolete("TODO: WB This seems legacy as we reference WebForms Control type", false)] - public MacroCacheContent(Control control, string ID) - { - _control = control; - _id = ID; - } - - public string ID - { - get { return _id; } - } - - public Control Content - { - get { return _control; } - } - } -}