From 8ad8a3239ad8b227edb0ef38af42769ee6c47ce1 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 22 Feb 2013 12:01:47 -0100 Subject: [PATCH 1/2] Make sure that the installer doesn't crash if dbSettings are null --- .../umbraco.presentation/install/steps/database.ascx.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs index 7d88678b05..008ceb4175 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs @@ -74,8 +74,11 @@ namespace umbraco.presentation.install.steps { //If the connection string is already present in web.config we don't need to show the settings page and we jump to installing/upgrading. var databaseSettings = ConfigurationManager.ConnectionStrings[Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName]; - - var dbIsSqlCe = databaseSettings.ProviderName == "System.Data.SqlServerCe.4.0"; + + var dbIsSqlCe = false; + if(databaseSettings != null && databaseSettings.ProviderName != null) + dbIsSqlCe = databaseSettings.ProviderName == "System.Data.SqlServerCe.4.0"; + var sqlCeDatabaseExists = false; if (dbIsSqlCe) sqlCeDatabaseExists = File.Exists(databaseSettings.ConnectionString.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString())); From 596c4ac329182cf902920824436deda1b0c75db7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 22 Feb 2013 12:36:24 -0100 Subject: [PATCH 2/2] Fixes: U4-1721 V6: Publish of a page ends in YSOD when using legacy schema --- src/Umbraco.Core/Models/PropertyExtensions.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Umbraco.Core/Models/PropertyExtensions.cs b/src/Umbraco.Core/Models/PropertyExtensions.cs index c4568e8472..1b851d8d4b 100644 --- a/src/Umbraco.Core/Models/PropertyExtensions.cs +++ b/src/Umbraco.Core/Models/PropertyExtensions.cs @@ -19,6 +19,14 @@ namespace Umbraco.Core.Models var xd = new XmlDocument(); XmlNode xmlNode = xd.CreateNode(XmlNodeType.Element, nodeName, ""); + //Add the property alias to the legacy schema + if (UmbracoSettings.UseLegacyXmlSchema) + { + var alias = xd.CreateAttribute("alias"); + alias.Value = property.Alias.ToSafeAlias(); + xmlNode.Attributes.Append(alias); + } + //This seems to fail during testing xmlNode.AppendChild(property.PropertyType.DataType(property.Id).Data.ToXMl(xd));