UPD: Implicit mail validity check

[gigi.git] / src / org / cacert / gigi / output / template / IfStatement.java

diff --git a/src/org/cacert/gigi/output/template/IfStatement.java b/src/org/cacert/gigi/output/template/IfStatement.java
index 02687630b8ab84757944ddae45c1103927b92905..e33cd896546591def0fb346ad4c7e704b257688a 100644 (file)
--- a/src/org/cacert/gigi/output/template/IfStatement.java
+++ b/src/org/cacert/gigi/output/template/IfStatement.java
@@ -6,11 +6,11 @@ import java.util.Map;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.output.Outputable;
 
-final class IfStatement implements Outputable {
+public final class IfStatement implements Outputable {
        private final String variable;
        private final TemplateBlock body;
 
-       IfStatement(String variable, TemplateBlock body) {
+       public IfStatement(String variable, TemplateBlock body) {
                this.variable = variable;
                this.body = body;
        }
@@ -18,7 +18,7 @@ final class IfStatement implements Outputable {
        @Override
        public void output(PrintWriter out, Language l, Map<String, Object> vars) {
                Object o = vars.get(variable);
-               if (o instanceof Boolean && o == Boolean.TRUE) {
+               if (!(o == Boolean.FALSE || o == null)) {
                        body.output(out, l, vars);
                }
        }