core: evaluate 'and'/'or' as 'andalso' and 'orelse'. Fixes #1561

zotonic · Jan 10, 2017 · 0e298fe · 0e298fe
1 parent 94054b7
commit 0e298fe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/erlydtl/erlydtl_operators.erl b/src/erlydtl/erlydtl_operators.erl
@@ -46,13 +46,13 @@
 
 
 'and'(A, B, Context) ->
-    erlydtl_runtime:is_true(A, Context) and erlydtl_runtime:is_true(B, Context).
+    erlydtl_runtime:is_true(A, Context) andalso erlydtl_runtime:is_true(B, Context).
 
 'not'(A, Context) ->
     erlydtl_runtime:is_false(A, Context).
 
 'or'(A, B, Context) ->
-    erlydtl_runtime:is_true(A, Context) or erlydtl_runtime:is_true(B, Context).
+    erlydtl_runtime:is_true(A, Context) orelse erlydtl_runtime:is_true(B, Context).
 
 'xor'(A, B, Context) ->
     erlydtl_runtime:is_true(A, Context) xor erlydtl_runtime:is_true(B, Context).