From d8654bdf5c5e0e062a683b40ba826f9638e25d41 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 28 Apr 2014 12:47:08 -0400 Subject: [PATCH] Merged #51 "Can not force default locale to English or to a locale with a country code" --- src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java index f7be99a..27542bd 100644 --- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java +++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java @@ -27,8 +27,7 @@ super(); GitBlitWebSession session = GitBlitWebSession.get(); UserModel user = session.getUser(); - app().session().setCookie((WebResponse) getResponse(), null); - app().session().logout(user); + app().authentication().logout(((WebResponse) getResponse()).getHttpServletResponse(), user); session.invalidate(); /* -- Gitblit v1.9.1