From 332e93c9e8b2ef756ac2b2ec1055262046f988fa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 30 Mar 2012 20:01:03 -0400
Subject: [PATCH] Merge pull request #10 from jonnybbb/master
---
src/com/gitblit/wicket/pages/GravatarProfilePage.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/GravatarProfilePage.java b/src/com/gitblit/wicket/pages/GravatarProfilePage.java
index 1d702a7..e8a96fd 100644
--- a/src/com/gitblit/wicket/pages/GravatarProfilePage.java
+++ b/src/com/gitblit/wicket/pages/GravatarProfilePage.java
@@ -49,9 +49,12 @@
profile = ActivityUtils.getGravatarProfile(object);
}
} catch (IOException e) {
- error(MessageFormat.format("Failed to find Gravatar profile for {0}", object), e, true);
+ error(MessageFormat.format(getString("gb.failedToFindGravatarProfile"), object), e, true);
}
-
+
+ if (profile == null) {
+ error(MessageFormat.format(getString("gb.failedToFindGravatarProfile"), object), true);
+ }
add(new Label("displayName", profile.displayName));
add(new Label("username", profile.preferredUsername));
add(new Label("location", profile.currentLocation));
--
Gitblit v1.9.1