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

Fixes

Browse Source
This commit is contained in:
Bjarke Berg
2022-03-18 08:02:44 +01:00
parent c08921d3e6
commit 608a65147f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Infrastructure/Services/Implement/MacroService.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
@@ -34,7 +34,7 @@ namespace Umbraco.Cms.Core.Services.Implement
{
if (_macroRepository is not IMacroWithAliasRepository macroWithAliasRepository)
{
return GetAll().First();
return GetAll().FirstOrDefault(x=>x.Alias == alias);
}
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -68,7 +68,8 @@ namespace Umbraco.Cms.Core.Services.Implement
{
if (_macroRepository is not IMacroWithAliasRepository macroWithAliasRepository)
{
return GetAll();
var hashset = new HashSet<string>(aliases);
return GetAll().Where(x=> hashset.Contains(x.Alias));
}
using (var scope = ScopeProvider.CreateScope(autoComplete: true))

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

@@ -88,6 +88,10 @@ namespace Umbraco.Cms.Infrastructure.Templates
foreach (var macro in macros)
{
var macroConfig = macroConfigs.FirstOrDefault(f => f.Alias == macro.Item1);
if (macroConfig is null)
{
continue;
}
foundMacroUmbracoEntityReferences.Add(new UmbracoEntityReference(Udi.Create(Constants.UdiEntityType.Macro, macroConfig.Key)));
// Only do this if the macros actually have parameters
if (macroConfig.Properties != null && macroConfig.Properties.Keys.Any(f => f != "macroAlias"))