Merge branch '4.x' into wycats-master

# Conflicts: # spec/regressions.js
2017-03-25 15:04:37 +01:00
parent d40cbfc70d c8f4b570c1
commit 714a4c4482
3 changed files with 9 additions and 2 deletions
@@ -910,7 +910,7 @@ JavaScriptCompiler.prototype = {
    let params = [],
        paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
    let foundHelper = this.nameLookup('helpers', name, 'helper'),
-        callContext = this.aliasable(`${this.contextName(0)} != null ? ${this.contextName(0)} : {}`);
+        callContext = this.aliasable(`${this.contextName(0)} != null ? ${this.contextName(0)} : (container.nullContext || {})`);

    return {
      params: params,