From 1f3dff18737576a30bad8e1b7ea45c00fcad265a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 03 Mar 2014 17:02:52 -0500 Subject: [PATCH] Eliminate problematic HEAD links from the blob, blame, and tree pages --- src/main/java/com/gitblit/wicket/panels/BasePanel.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/BasePanel.java b/src/main/java/com/gitblit/wicket/panels/BasePanel.java index b60579b..dda5797 100644 --- a/src/main/java/com/gitblit/wicket/panels/BasePanel.java +++ b/src/main/java/com/gitblit/wicket/panels/BasePanel.java @@ -24,9 +24,9 @@ import org.apache.wicket.model.Model; import com.gitblit.Constants; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.utils.TimeUtils; +import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; @@ -40,9 +40,13 @@ super(wicketId); } + protected GitBlitWebApp app() { + return GitBlitWebApp.get(); + } + protected TimeZone getTimeZone() { - return GitBlit.getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get() - .getTimezone() : GitBlit.getTimezone(); + return app().settings().getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get() + .getTimezone() : app().getTimezone(); } protected TimeUtils getTimeUtils() { -- Gitblit v1.9.1