Use jsDelivr for font-awesome

Fixes #3330 Fixes #3318
OrchardCMS · Mar 16, 2019 · 8b339fe · siyamandayubi · Mar 20, 2019 · hyzx86
1 parent 0e6f948
commit 8b339fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManifest.cs b/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManifest.cs
@@ -166,23 +166,23 @@ public void BuildManifests(IResourceManifestBuilder builder)
 
             manifest
                 .DefineStyle("font-awesome")
-                .SetCdn("https://use.fontawesome.com/releases/v5.5.0/css/all.css")
-                .SetCdnIntegrity("sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU")
-                .SetVersion("5.5.0")
+                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome[email protected]/css/all.min.css","https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.css")
+                .SetCdnIntegrity("sha256-nAmazAk6vS34Xqo0BSrTb+abbtFlgsFK7NKSi6o7Y78=", "sha256-DVK12s61Wqwmj3XI0zZ9MFFmnNH8puF/eRHTB4ftKwk=")
+                .SetVersion("5.7.2")
                 ;
 
             manifest
                 .DefineScript("font-awesome")
-                .SetCdn("https://use.fontawesome.com/releases/v5.5.0/js/all.js")
-                .SetCdnIntegrity("sha384-GqVMZRt5Gn7tB9D9q7ONtcp4gtHIUEW/yG7h98J7IpE3kpi+srfFyyB/04OV6pG0")
-                .SetVersion("5.5.0")
+                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome[email protected]/js/all.min.js","https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/js/all.js")
+                .SetCdnIntegrity("sha256-Oq0ot7xtAl3WqR2277bwtP+iuV2uOTCh03M1ZCjIsJw=", "sha256-3thD9grC33Xa/xFJXfs8ZryCIwIn+LTX/k3r3KxSel0=")
+                .SetVersion("5.7.2")
                 ;
 
             manifest
                 .DefineScript("font-awesome-v4-shims")
-                .SetCdn("https://use.fontawesome.com/releases/v5.5.0/js/v4-shims.js")
-                .SetCdnIntegrity("sha384-vBDTb50BKnwbvJZ5ZC5dsGJNQydTI7ZoAjCeJkdta6nSewwGXCnppKI5lrIQX4Qu")
-                .SetVersion("5.5.0")
+                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome[email protected]/js/v4-shims.min.js","https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/js/v4-shims.js")
+                .SetCdnIntegrity("sha256-Dy8KjLriNkSRrlgRJaVAoXdvxOlz8ico4RVRmZJsxD8=", "sha256-Hr8WbqmgdrcXJGhodaZ1ATNeusCHFbb3GxGVyA32C9E=")
+                .SetVersion("5.7.2")
                 ;
         }
     }

diff --git a/...rchardCore.Modules/OrchardCore.Workflows/Expressions/LiquidWorkflowExpressionEvaluator.cs b/...rchardCore.Modules/OrchardCore.Workflows/Expressions/LiquidWorkflowExpressionEvaluator.cs
@@ -63,8 +63,8 @@ private async Task<TemplateContext> CreateTemplateContextAsync(WorkflowExecution
             context.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Input", obj => new LiquidPropertyAccessor(name => ToFluidValue(obj.Input, name)));
             context.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Output", obj => new LiquidPropertyAccessor(name => ToFluidValue(obj.Output, name)));
             context.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Properties", obj => new LiquidPropertyAccessor(name => ToFluidValue(obj.Properties, name)));
-            context.SetValue("Workflow", workflowContext);
 
+            context.SetValue(nameof(WorkflowExecutionContext), workflowContext);
             // Add services.
             context.AmbientValues.Add("Services", services);