Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

This commit is contained in:
Shannon
2013-09-25 19:23:41 +10:00
parent f356b94c39
commit 1e9a17babe
125 changed files with 397 additions and 509 deletions

View File

@@ -22,13 +22,13 @@ namespace Umbraco.Core.Models
internal static XElement ToXml(this Property property, IDataTypeService dataTypeService)
{
var nodeName = UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema ? "data" : property.Alias.ToSafeAlias();
var nodeName = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "data" : property.Alias.ToSafeAlias();
var xd = new XmlDocument();
var xmlNode = xd.CreateNode(XmlNodeType.Element, nodeName, "");
//Add the property alias to the legacy schema
if (UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema)
if (UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema)
{
var alias = xd.CreateAttribute("alias");
alias.Value = property.Alias.ToSafeAlias();