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

Clean up

Browse Source
This commit is contained in:
Bjarke Berg
2024-04-18 13:43:01 +02:00
parent 5d51d81545
commit 487f480548
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Infrastructure/Templates/HtmlMacroParameterParser.cs
View File

@@ -55,13 +55,9 @@ public sealed class HtmlMacroParameterParser : IHtmlMacroParameterParser
macroAlias,
new Dictionary<string, string>(macroAttributes, StringComparer.OrdinalIgnoreCase))));
if (foundMacros.Count > 0)
{
foreach (UmbracoEntityReference umbracoEntityReference in GetUmbracoEntityReferencesFromMacros(foundMacros))
{
yield return umbracoEntityReference;
}
}
return foundMacros.Count > 0
? GetUmbracoEntityReferencesFromMacros(foundMacros)
: Enumerable.Empty<UmbracoEntityReference>();
}
/// <summary>
@@ -85,13 +81,9 @@ public sealed class HtmlMacroParameterParser : IHtmlMacroParameterParser
}
}
if (foundMacros.Count > 0)
{
foreach (UmbracoEntityReference umbracoEntityReference in GetUmbracoEntityReferencesFromMacros(foundMacros))
{
yield return umbracoEntityReference;
}
}
return foundMacros.Count > 0
? GetUmbracoEntityReferencesFromMacros(foundMacros)
: Enumerable.Empty<UmbracoEntityReference>();
}
private IEnumerable<UmbracoEntityReference> GetUmbracoEntityReferencesFromMacros(
@@ -102,6 +94,7 @@ public sealed class HtmlMacroParameterParser : IHtmlMacroParameterParser
yield break;
}
IEnumerable<string?> uniqueMacroAliases = macros.Select(f => f.Item1).Distinct();
// TODO: Tracking Macro references