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

More xslt removal

Browse Source
This commit is contained in:
Shannon
2018-05-01 00:15:05 +10:00
parent 9a2797303b
commit 6db5ebf6f9
81 changed files with 48 additions and 3528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Services/Implement/PackagingService.cs
View File

@@ -1271,8 +1271,6 @@ namespace Umbraco.Core.Services.Implement
var macroName = macroElement.Element("name").Value;
var macroAlias = macroElement.Element("alias").Value;
var controlType = macroElement.Element("scriptType").Value;
var controlAssembly = macroElement.Element("scriptAssembly").Value;
var xsltPath = macroElement.Element("xslt").Value;
var scriptPath = macroElement.Element("scriptingFile").Value;
//Following xml elements are treated as nullable properties
@@ -1308,7 +1306,7 @@ namespace Umbraco.Core.Services.Implement
}
var existingMacro = _macroService.GetByAlias(macroAlias) as Macro;
var macro = existingMacro ?? new Macro(macroAlias, macroName, controlType, controlAssembly, xsltPath, scriptPath,
var macro = existingMacro ?? new Macro(macroAlias, macroName, controlType, scriptPath,
cacheByPage, cacheByMember, dontRender, useInEditor, cacheDuration);
var properties = macroElement.Element("properties");