Merge branch '4.x'

# Conflicts: # Gruntfile.js # lib/handlebars/exception.js # spec/partials.js # spec/regressions.js
2017-02-14 23:10:02 +01:00
parent 0fa10b6e87
commit 911e676af4
1 changed files with 1 additions and 6 deletions
@@ -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];
    }