]> WPIA git - gigi.git/commitdiff
fix: allow searchUserIdByDomain to find re-added domains
authorFelix Dörre <felix@dogcraft.de>
Thu, 18 Aug 2016 17:53:25 +0000 (19:53 +0200)
committerFelix Dörre <felix@dogcraft.de>
Fri, 19 Aug 2016 07:30:05 +0000 (09:30 +0200)
Change-Id: I23e433c32161aac2548855b25b3eda811740b415

src/org/cacert/gigi/dbObjects/Domain.java

index d4ffd8e28d377b038953a1cc2e2d808aeb16fd05..f4a828c3a84543401d09879e71b612a5ed0bd133 100644 (file)
@@ -174,7 +174,7 @@ public class Domain implements IdCachable, Verifyable {
     }
 
     public static Domain searchUserIdByDomain(String domain) {
-        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `domains` WHERE `domain` = ?")) {
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `domains` WHERE `domain` = ? AND `deleted` IS NULL")) {
             ps.setString(1, domain);
             GigiResultSet res = ps.executeQuery();
             if (res.next()) {