From 2e06c61a4fafda4236cb28d9b062faee19c9644d Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 26 Sep 2013 09:04:23 +0200 Subject: [PATCH] Fix issues after merge --- .../XmlPublishedCache/XmlPublishedContent.cs | 8 ++++---- src/Umbraco.Web/Templates/TemplateUtilities.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs index 8e0c66cf2b..31a42cdebf 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs @@ -374,7 +374,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache if (_xmlNode.Attributes.GetNamedItem("writerID") != null) _writerId = int.Parse(_xmlNode.Attributes.GetNamedItem("writerID").Value); - if (UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema) + if (UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema) { if (_xmlNode.Attributes.GetNamedItem("nodeTypeAlias") != null) _docTypeAlias = _xmlNode.Attributes.GetNamedItem("nodeTypeAlias").Value; @@ -401,7 +401,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } // load data - var dataXPath = UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema ? "data" : "* [not(@isDoc)]"; + var dataXPath = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "data" : "* [not(@isDoc)]"; var nodes = _xmlNode.SelectNodes(dataXPath); _contentType = PublishedContentType.Get(PublishedItemType.Content, _docTypeAlias); @@ -410,7 +410,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache if (nodes != null) foreach (XmlNode n in nodes) { - var alias = UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema + var alias = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? n.Attributes.GetNamedItem("alias").Value : n.Name; propertyNodes[alias.ToLowerInvariant()] = n; @@ -433,7 +433,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache if (_xmlNode == null) return; // load children - var childXPath = UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema ? "node" : "* [@isDoc]"; + var childXPath = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "node" : "* [@isDoc]"; var nav = _xmlNode.CreateNavigator(); var expr = nav.Compile(childXPath); expr.AddSort("@sortOrder", XmlSortOrder.Ascending, XmlCaseOrder.None, "", XmlDataType.Number); diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs index 5e19cc8069..557d4ed0af 100644 --- a/src/Umbraco.Web/Templates/TemplateUtilities.cs +++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs @@ -72,7 +72,7 @@ namespace Umbraco.Web.Templates /// public static string ResolveUrlsFromTextString(string text) { - if (UmbracoConfiguration.For.UmbracoSettings().Content.ResolveUrlsFromTextString == false) return text; + if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString == false) return text; using (var timer = DisposableTimer.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete")) {