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

Eh, yeah, maybe I should start with making a copy of the element first.. d'oh!

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-04-17 11:16:15 -02:00
parent 0cf2a1fc2a
commit eba7582a97
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Core/Services/PackagingService.cs
View File

@@ -582,21 +582,22 @@ namespace Umbraco.Core.Services
foreach (XElement tempElement in templateElements) foreach (XElement tempElement in templateElements)
{ {
var dependencies = new List<string>(); var dependencies = new List<string>();
if (tempElement.Element("Master") != null && var elementCopy = tempElement;
string.IsNullOrEmpty(tempElement.Element("Master").Value) == false &&
templateElements.Any(x => x.Element("Alias").Value == tempElement.Element("Master").Value)) if (elementCopy.Element("Master") != null &&
string.IsNullOrEmpty(elementCopy.Element("Master").Value) == false &&
templateElements.Any(x => x.Element("Alias").Value == elementCopy.Element("Master").Value))
{ {
dependencies.Add(tempElement.Element("Master").Value); dependencies.Add(elementCopy.Element("Master").Value);
} }
else if (tempElement.Element("Master") != null && else if (elementCopy.Element("Master") != null &&
string.IsNullOrEmpty(tempElement.Element("Master").Value) == false && string.IsNullOrEmpty(elementCopy.Element("Master").Value) == false &&
templateElements.Any(x => x.Element("Alias").Value == tempElement.Element("Master").Value) == templateElements.Any(x => x.Element("Alias").Value == elementCopy.Element("Master").Value) ==
false) false)
{ {
LogHelper.Info<PackagingService>(string.Format("Template '{0}' has an invalid Master '{1}', so the reference has been ignored.", tempElement.Element("Alias").Value, tempElement.Element("Master").Value)); LogHelper.Info<PackagingService>(string.Format("Template '{0}' has an invalid Master '{1}', so the reference has been ignored.", elementCopy.Element("Alias").Value, elementCopy.Element("Master").Value));
} }
XElement elementCopy = tempElement;
var field = new TopologicalSorter.DependencyField<XElement> var field = new TopologicalSorter.DependencyField<XElement>
{ {
Alias = elementCopy.Element("Alias").Value, Alias = elementCopy.Element("Alias").Value,