yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with 6.1.2

Browse Source
This commit is contained in:
Shannon Deminick
2013-06-03 13:36:40 -10:00
parent edfffad122 932115585e
commit 76bbdcd32c
31 changed files with 260 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Models/ContentExtensions.cs
View File

@@ -543,10 +543,7 @@ namespace Umbraco.Core.Models
x.Add(new XAttribute("writerName", content.GetWriterProfile().Name));
x.Add(new XAttribute("writerID", content.WriterId));
x.Add(new XAttribute("template", content.Template == null ? "0" : content.Template.Id.ToString()));
if (UmbracoSettings.UseLegacyXmlSchema)
{
x.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
}
x.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
return x;
}
@@ -567,10 +564,7 @@ namespace Umbraco.Core.Models
x.Add(new XAttribute("writerID", media.CreatorId));
x.Add(new XAttribute("version", media.Version));
x.Add(new XAttribute("template", 0));
if (UmbracoSettings.UseLegacyXmlSchema)
{
x.Add(new XAttribute("nodeTypeAlias", media.ContentType.Alias));
}
x.Add(new XAttribute("nodeTypeAlias", media.ContentType.Alias));
return x;
}