From 654c3b7403fafa9a6f5b3d09941f3082014c93f7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 23 Nov 2012 08:02:23 -0100 Subject: [PATCH] Another temporary fix for trees being unavailable after install, the context is null during upgrades in the installer, so would cause a YSOD --- .../umbraco.presentation/install/steps/theend.ascx.cs | 2 +- src/umbraco.businesslogic/ApplicationTreeRegistrar.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs index 56a49c13c2..9e05fc88aa 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs @@ -32,7 +32,7 @@ namespace umbraco.presentation.install.steps if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) customizeSite.Visible = false; - var initTrees = new ApplicationTreeRegistrar(); + new ApplicationTreeRegistrar(); } #region Web Form Designer generated code diff --git a/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs b/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs index 97628bbacd..07175dcc96 100644 --- a/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs +++ b/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs @@ -31,7 +31,7 @@ namespace umbraco.BusinessLogic public ApplicationTreeRegistrar() { //don't do anything if the application is not configured! - if (!ApplicationContext.Current.IsConfigured) + if (ApplicationContext.Current == null || !ApplicationContext.Current.IsConfigured) return; // Load all Trees by attribute and add them to the XML config