preparation of 2.3.2

abecms · Sep 6, 2016 · fc93850 · fc93850
1 parent 1c952c8
commit fc93850
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/dist/cli/handlebars/utils/isTrue.js b/dist/cli/handlebars/utils/isTrue.js
@@ -19,9 +19,19 @@ function isTrue(v1, operator, v2) {
     case '>=':
       return v1 >= v2;
     case '&&':
-      return v1 && v2;
+      var eval1 = false;
+      var eval2 = false;
+      if (v1 && !Array.isArray(v1) || v1.length > 0) eval1 = true;
+      if (v2 && !Array.isArray(v2) || v2.length > 0) eval2 = true;
+
+      return eval1 && eval2;
     case '||':
-      return v1 || v2;
+      var eval1 = false;
+      var eval2 = false;
+      if (v1 && !Array.isArray(v1) || v1.length > 0) eval1 = true;
+      if (v2 && !Array.isArray(v2) || v2.length > 0) eval2 = true;
+
+      return eval1 || eval2;
     default:
       return false;
   }