fix context argument bug when handlebars helpers is not block helper.…

… rename old_ctx to _this
zordius · Feb 27, 2015 · d1f1b93 · d1f1b93 · werdnum · Mar 3, 2015
1 parent 0d3d1ef
commit d1f1b93
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lightncandy.php b/src/lightncandy.php
@@ -1888,7 +1888,7 @@ protected static function compileCustomHelper(&$context, &$vars, $raw, $err = fa
         $ch = array_shift($vars);
         $v = static::getVariableNames($vars, $context);
         static::addUsageCount($context, $notHH ? 'helpers' : 'hbhelpers', $ch[0]);
-        return $context['ops']['seperator'] . static::getFuncName($context, $notHH ? 'ch' : 'hbch', "$ch[0] " . implode(' ', $v[1])) . "\$cx, '$ch[0]', {$v[0]}, '$fn'" . ($notHH ? '' : ', \'$in\'') . "){$context['ops']['seperator']}";
+        return $context['ops']['seperator'] . static::getFuncName($context, $notHH ? 'ch' : 'hbch', "$ch[0] " . implode(' ', $v[1])) . "\$cx, '$ch[0]', {$v[0]}, '$fn'" . ($notHH ? '' : ', $in') . "){$context['ops']['seperator']}";
     }
 
     /**
@@ -2515,7 +2515,7 @@ public static function hbch($cx, $ch, $vars, $op, $inverted, $cb = null, $else =
         $options = array(
             'name' => $ch,
             'hash' => $vars[1],
-            'old_ctx' => $isBlock ? $op : end( $cx['scopes'] ),
+            '_this' => $isBlock ? $op : $inverted,
         );
 
         // $invert the logic