From 2b8a0fd89bdf63dcf87ae868559b97f8d3e6eee2 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 08 Sep 2014 13:10:38 -0400 Subject: [PATCH] Fix ticket mail dropping bug when author does not have an address --- src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java index ff3b507..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,8 +27,7 @@ super(); GitBlitWebSession session = GitBlitWebSession.get(); UserModel user = session.getUser(); - GitBlit.self().setCookie((WebResponse) getResponse(), null); - GitBlit.self().logout(user); + app().authentication().logout(((WebResponse) getResponse()).getHttpServletResponse(), user); session.invalidate(); /* -- Gitblit v1.9.1