diff options
| -rw-r--r-- | releases.moxie | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/releases.moxie b/releases.moxie index f51af67a..61e2153d 100644 --- a/releases.moxie +++ b/releases.moxie @@ -8,6 +8,7 @@ r17: { fixes:
- Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
- Fix NPE when getting user's fork without repository list caching (issue 182)
+ - Fix internal error on folder history links (issue 192)
additions:
- Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)
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 {
|