chg: ensure actor, target and support ticket are non-null

[gigi.git] / src / club / wpia / gigi / pages / wot / VerifyPage.java

diff --git a/src/club/wpia/gigi/pages/wot/VerifyPage.java b/src/club/wpia/gigi/pages/wot/VerifyPage.java
index e3fdf534d1f930107b0b3c69d6180aacf3aa5df2..e2c216baf9f4830cc462c941d3d4d62f94648117 100644 (file)
--- a/src/club/wpia/gigi/pages/wot/VerifyPage.java
+++ b/src/club/wpia/gigi/pages/wot/VerifyPage.java
@@ -79,14 +79,12 @@ public class VerifyPage extends Page {
                 } else {
                     if ( !verified) {
                         out.println(translate(req, "User is not yet verified. Please try again in 24 hours!"));
-                    } else if (getUser(req).getId() == id) {
-
                     } else {
                         User applicant = User.getById(id);
                         try {
                             new VerificationForm(req, applicant).output(out, getLanguage(req), getDefaultVars(req));
                         } catch (GigiApiException e) {
-                            e.format(out, Page.getLanguage(req));
+                            e.format(out, Page.getLanguage(req), getDefaultVars(req));
                         }
                     }
                 }
@@ -96,7 +94,7 @@ public class VerifyPage extends Page {
             }
 
         } catch (GigiApiException e) {
-            e.format(out, getLanguage(req));
+            e.format(out, getLanguage(req), getDefaultVars(req));
         }
     }
 }