Merge commit '87b5d4ee61605b026506e92c9e8873d867c5f150' into es6-modules

Conflicts: dist/handlebars.js dist/handlebars.runtime.js lib/handlebars/base.js lib/handlebars/utils.js
2013-09-02 16:19:28 -05:00
parent 530f1903aa 87b5d4ee61
commit 192887cedc
11 changed files with 96 additions and 64 deletions
@@ -117,7 +117,7 @@ function registerDefaultHelpers(instance) {
    var type = toString.call(conditional);
    if(type === functionType) { conditional = conditional.call(this); }

-    if(!conditional || isEmpty(conditional)) {
+    if (isEmpty(conditional)) {
      return options.inverse(this);
    } else {
      return options.fn(this);