From ec7fb78e7992c7b3ff14410f56f64d3b2c402bcc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 07 Mar 2015 09:05:14 -0500
Subject: [PATCH] Merge branch 'ticket/244' into develop

---
 src/main/java/com/gitblit/wicket/pages/LogoutPage.java |    4 ++--
 1 files changed, 2 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..a8ae7d0 100644
--- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
@@ -27,8 +27,8 @@
 		super();
 		GitBlitWebSession session = GitBlitWebSession.get();
 		UserModel user = session.getUser();
-		app().session().setCookie((WebResponse) getResponse(), null);
-		app().session().logout(user);
+		app().authentication().logout(((WebRequest) getRequest()).getHttpServletRequest(),
+				((WebResponse) getResponse()).getHttpServletResponse(), user);
 		session.invalidate();
 
 		/*

--
Gitblit v1.9.1