Fix all_route_data liquid attribute helper (OrchardCMS#17347)

gvkries · Jan 14, 2025 · 4cf9052 · 4cf9052
1 parent 0042306
commit 4cf9052
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AnchorTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AnchorTag.cs
@@ -1,6 +1,7 @@
 using System.Text.Encodings.Web;
 using Fluid;
 using Fluid.Ast;
+using Fluid.Values;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Routing;
@@ -54,11 +55,20 @@ public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> ar
 
                 case "all_route_data":
 
-                    var allRouteData = (await argument.Expression.EvaluateAsync(context)).ToObjectValue();
+                    var objectValue = (await argument.Expression.EvaluateAsync(context)).ToObjectValue();
 
-                    if (allRouteData is Dictionary<string, string> allRouteValues)
+                    if (objectValue is IFluidIndexable allRouteData)
                     {
-                        routeValues = allRouteValues;
+                        // Copy all string key-value pairs to routeValues
+                        routeValues = new();
+                        foreach (var key in allRouteData.Keys)
+                        {
+                            bool success = allRouteData.TryGetValue(key, out FluidValue fluidValue);
+                            if (success && fluidValue is StringValue)
+                            {
+                                routeValues.Add(key, fluidValue.ToStringValue());
+                            }
+                        }
                     }
 
                     break;