From 077d23176a8f098766bf492081ae5ab9acb2d285 Mon Sep 17 00:00:00 2001
From: Carsten Lenz <clenz2@csc.com>
Date: Fri, 13 Jun 2014 08:26:23 -0400
Subject: [PATCH] Add german translation of welcome.mkd
---
src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
index 1028c5a..27542bd 100644
--- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
@@ -18,7 +18,6 @@
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
-import com.gitblit.GitBlit;
import com.gitblit.models.UserModel;
import com.gitblit.wicket.GitBlitWebSession;
@@ -28,10 +27,9 @@
super();
GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();
- GitBlit.self().setCookie((WebResponse) getResponse(), null);
- GitBlit.self().logout(user);
- session.invalidate();
-
+ app().authentication().logout(((WebResponse) getResponse()).getHttpServletResponse(), user);
+ session.invalidate();
+
/*
* Now check whether the authentication was realized via the Authorization in the header.
* If so, it is likely to be cached by the browser, and cannot be undone. Effectively, this means
@@ -41,7 +39,7 @@
// authentication will be done via this route anyway, show a page to close the browser:
// this will be done by Wicket.
setupPage(null, getString("gb.logout"));
-
+
} else {
setRedirect(true);
setResponsePage(getApplication().getHomePage());
--
Gitblit v1.9.1