From 66a8db8f81165ea3ab5cdab0f7ca9dd3e6c20d1a Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 28 Mar 2013 16:42:12 -0400 Subject: Fixed internal error on folder history links (issue 192) --- src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java index e5878635..4d275892 100644 --- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java @@ -109,13 +109,13 @@ public class HistoryPanel extends BasePanel { } final boolean isTree = matchingPath == null ? true : matchingPath.isTree(); - final boolean isSubmodule = matchingPath == null ? true : matchingPath.isSubmodule(); + final boolean isSubmodule = matchingPath == null ? false : matchingPath.isSubmodule(); // submodule - SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath.path); final String submodulePath; final boolean hasSubmodule; - if (submodule != null) { + if (isSubmodule) { + SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath == null ? null : matchingPath.path); submodulePath = submodule.gitblitPath; hasSubmodule = submodule.hasSubmodule; } else { -- cgit v1.2.3