From b461a45f420471f931029898d97464ecc5039f49 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 22 Dec 2012 00:27:04 -0500
Subject: [PATCH] Do not pass null email address to PersonIdent
---
src/com/gitblit/wicket/pages/ForksPage.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ForksPage.java b/src/com/gitblit/wicket/pages/ForksPage.java
index 2e67e2b..cc48387 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.java
+++ b/src/com/gitblit/wicket/pages/ForksPage.java
@@ -58,7 +58,7 @@
if (repository.isPersonalRepository()) {
UserModel user = GitBlit.self().getUserModel(repository.projectPath.substring(1));
- PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
item.add(new GravatarImage("anAvatar", ident, 20));
if (pageRepository.equals(repository)) {
// do not link to self
@@ -94,7 +94,7 @@
if (user == null) {
user = UserModel.ANONYMOUS;
}
- if (user.canViewRepository(repository)) {
+ if (user.canView(repository)) {
if (pageRepository.equals(repository)) {
// do not link to self
item.add(new Label("aFork", StringUtils.stripDotGit(repo)));
--
Gitblit v1.9.1