Merge remote-tracking branch 'origin/libs/scrypt/local'

[gigi.git] / src / org / cacert / gigi / pages / account / certs / Certificates.java

diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index 0c0282227f7dbf71eb65f7dab3c759ddfcc7bbda..e41a1b297914316ec12a591d8a8f4de52958fc56 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -56,7 +56,7 @@ public class Certificates extends Page {
         String serial = pi;
         try {
             Certificate c = Certificate.getBySerial(serial);
-            if (c == null || getUser(req).getId() != c.getOwnerId()) {
+            if (c == null || getUser(req).getId() != c.getOwner().getId()) {
                 resp.sendError(404);
                 return true;
             }
@@ -92,7 +92,7 @@ public class Certificates extends Page {
 
             String serial = pi;
             Certificate c = Certificate.getBySerial(serial);
-            if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
+            if (c == null || LoginPage.getUser(req).getId() != c.getOwner().getId()) {
                 resp.sendError(404);
                 return;
             }
@@ -110,7 +110,7 @@ public class Certificates extends Page {
 
         HashMap<String, Object> vars = new HashMap<String, Object>();
         User us = LoginPage.getUser(req);
-        vars.put("certs", new CertificateIterable(us.getCertificates()));
+        vars.put("certs", new CertificateIterable(us.getCertificates(false)));
         certTable.output(out, getLanguage(req), vars);
     }