fix block param for #each on Object case

zordius · Mar 23, 2018 · 21f791e · 21f791e
1 parent 8850d93
commit 21f791e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Runtime.php b/src/Runtime.php
@@ -372,7 +372,7 @@ public static function sec($cx, $v, $bp, $in, $each, $cb, $else = null) {
                     $raw = static::m($cx, $raw, array($bp[0] => $raw));
                 }
                 if (isset($bp[1])) {
-                    $raw = static::m($cx, $raw, array($bp[1] => $cx['sp_vars']['index']));
+                    $raw = static::m($cx, $raw, array($bp[1] => $index));
                 }
                 $ret[] = $cb($cx, $raw);
             }

diff --git a/tests/regressionTest.php b/tests/regressionTest.php
@@ -1541,6 +1541,15 @@ public function issueProvider()
                 'expected' => 'ab'
             ),
 
+            Array(
+                'template' => '{{#each . as |v k|}}#{{k}}{{/each}}',
+                'data' => Array('a' => Array(), 'c' => Array()),
+                'options' => Array(
+                    'flags' => LightnCandy::FLAG_HANDLEBARS
+                ),
+                'expected' => '#a#c'
+            ),
+
             Array(
                 'template' => '{{testNull null undefined 1}}',
                 'data' => 'test',