From bb9c968d3adcebfcfdea98956bab396fa9f36c21 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Feb 2014 02:30:05 +1100 Subject: [PATCH] fixes merge issues --- .../Configuration/GlobalSettings.cs | 17 +++++++++-------- ...rMediaXmlCacheForDeletedItemsAfterUpgrade.cs | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 3b8065b953..00f71b5bc4 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -333,14 +333,12 @@ namespace Umbraco.Core.Configuration setting.Remove(); xml.Save(fileName, SaveOptions.DisableFormatting); ConfigurationManager.RefreshSection("appSettings"); - } - } - + } } private static void SetMembershipProvidersLegacyEncoding(string providerName, bool useLegacyEncoding) { - var webConfigFilename = GetFullWebConfigFileName(); + var webConfigFilename = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root)); var webConfigXml = XDocument.Load(webConfigFilename, LoadOptions.PreserveWhitespace); var membershipConfigs = webConfigXml.XPathSelectElements("configuration/system.web/membership/providers/add").ToList(); @@ -357,22 +355,25 @@ namespace Umbraco.Core.Configuration webConfigXml.Save(webConfigFilename, SaveOptions.DisableFormatting); } - + private static bool ConfiguredMembershipProvidersLegacyEncoding(string providerName) { - var webConfigFilename = GetFullWebConfigFileName(); + var webConfigFilename = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root)); var webConfigXml = XDocument.Load(webConfigFilename, LoadOptions.PreserveWhitespace); var membershipConfigs = webConfigXml.XPathSelectElements("configuration/system.web/membership/providers/add").ToList(); var provider = membershipConfigs.SingleOrDefault(c => c.Attribute("name") != null && c.Attribute("name").Value == providerName); - + var useLegacyEncodingAttribute = provider.Attribute("useLegacyEncoding"); - + bool useLegacyEncoding; bool.TryParse(useLegacyEncodingAttribute.Value, out useLegacyEncoding); return useLegacyEncoding; + + } + /// /// Gets the full path to root. /// diff --git a/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs b/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs index 154c180496..3a498ea92f 100644 --- a/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs +++ b/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.Migrations; using Umbraco.Core.Persistence.SqlSyntax; @@ -27,7 +28,6 @@ namespace Umbraco.Web.Strategies.Migrations if (e.ConfiguredVersion <= target70) { - var sql = @"DELETE FROM cmsContentXml WHERE nodeId IN //This query is structured to work with MySql, SQLCE and SqlServer: // http://issues.umbraco.org/issue/U4-3876