Fix access to scope in Liquid arguments #2678

11ty · Dec 8, 2022 · f4cc4bc · f4cc4bc
1 parent 295fee1
commit f4cc4bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Engines/Liquid.js b/src/Engines/Liquid.js
@@ -148,8 +148,9 @@ class Liquid extends TemplateEngine {
         render: function* (ctx, emitter) {
           let rawArgs = Liquid.parseArguments(_t.argLexer, this.args);
           let argArray = [];
+          let contextScope = ctx.getAll();
           for (let arg of rawArgs) {
-            let b = yield liquidEngine.evalValue(arg, ctx.environments);
+            let b = yield liquidEngine.evalValue(arg, contextScope);
             argArray.push(b);
           }
 
@@ -186,8 +187,9 @@ class Liquid extends TemplateEngine {
         render: function* (ctx, emitter) {
           let rawArgs = Liquid.parseArguments(_t.argLexer, this.args);
           let argArray = [];
+          let contextScope = ctx.getAll();
           for (let arg of rawArgs) {
-            let b = yield liquidEngine.evalValue(arg, ctx.environments);
+            let b = yield liquidEngine.evalValue(arg, contextScope);
             argArray.push(b);
           }
 

diff --git a/src/Plugins/RenderPlugin.js b/src/Plugins/RenderPlugin.js
@@ -155,7 +155,7 @@ function EleventyPlugin(eleventyConfig, options = {}) {
         let normalizedContext = {};
         if (ctx) {
           if (opts.accessGlobalData) {
-            // parent template data cascade
+            // parent template data cascade, should this be `ctx.getAll()` (per below?)
             normalizedContext.data = ctx.environments;
           }
 
@@ -165,8 +165,9 @@ function EleventyPlugin(eleventyConfig, options = {}) {
 
         let rawArgs = Liquid.parseArguments(null, this.args);
         let argArray = [];
+        let contextScope = ctx.getAll();
         for (let arg of rawArgs) {
-          let b = yield liquidEngine.evalValue(arg, ctx.environments);
+          let b = yield liquidEngine.evalValue(arg, contextScope);
           argArray.push(b);
         }