Merge branch '4.x'

# Conflicts: # Gruntfile.js # lib/handlebars/exception.js # spec/partials.js # spec/regressions.js
handlebars-lang · Mar 9, 2017 · 84ed1f5 · 84ed1f5
1 parent 1130b5d
commit 84ed1f5
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
@@ -197,12 +197,7 @@ export function wrapProgram(container, i, fn, data, declaredBlockParams, blockPa
 export function resolvePartial(partial, context, options) {
   if (!partial) {
     if (options.name === '@partial-block') {
-      let data = options.data;
-      while (data['partial-block'] === noop) {
-        data = data._parent;
-      }
-      partial = data['partial-block'];
-      data['partial-block'] = noop;
+      partial = options.data['partial-block'];
     } else {
       partial = options.partials[options.name];
     }