Merge branch 'edit-wot-trust' into next

[Sone.git] / src / main / java / net / pterodactylus / sone / web / LogoutPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
index f173bbb..0b6e6e7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 import freenet.clients.http.ToadletContext;
 
@@ -34,7 +35,7 @@ public class LogoutPage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public LogoutPage(Template template, WebInterface webInterface) {
-               super("logout.html", template, "Page.Logout.Title", webInterface);
+               super("logout.html", template, "Page.Logout.Title", webInterface, true);
        }
 
        //
@@ -45,9 +46,9 @@ public class LogoutPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, Template template) throws RedirectException {
+       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
                setCurrentSone(request.getToadletContext(), null);
-               super.processTemplate(request, template);
+               super.processTemplate(request, dataProvider);
                throw new RedirectException("index.html");
        }
 
@@ -55,14 +56,6 @@ public class LogoutPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected boolean requiresLogin() {
-               return true;
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
        public boolean isEnabled(ToadletContext toadletContext) {
                return getCurrentSone(toadletContext) != null;
        }