From d17f433bf1c709b4daab58f503a142dd5e19cc4a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 13 Dec 2011 16:52:19 -0500
Subject: [PATCH] Fixed null pointer possibility for gravatar profiles
---
src/com/gitblit/wicket/WicketUtils.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 0a20718..dbeb47f 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -259,6 +259,10 @@
return new PageParameters("user=" + username);
}
+ public static PageParameters newTeamnameParameter(String teamname) {
+ return new PageParameters("team=" + teamname);
+ }
+
public static PageParameters newRepositoryParameter(String repositoryName) {
return new PageParameters("r=" + repositoryName);
}
@@ -377,6 +381,10 @@
return params.getString("user", "");
}
+ public static String getTeamname(PageParameters params) {
+ return params.getString("team", "");
+ }
+
public static String getToken(PageParameters params) {
return params.getString("t", "");
}
@@ -453,7 +461,11 @@
dateString = df.format(date);
}
String title = null;
- if (date.getTime() <= System.currentTimeMillis()) {
+ if (TimeUtils.isToday(date)) {
+ title = "today";
+ } else if (TimeUtils.isYesterday(date)) {
+ title = "yesterday";
+ } else if (date.getTime() <= System.currentTimeMillis()) {
// past
title = TimeUtils.timeAgo(date);
}
--
Gitblit v1.9.1