From 832aa2a6f35b70da370e2f25060132150c91d220 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 25 Aug 2012 08:24:58 -0400
Subject: [PATCH] Reset build identifiers for the next release
---
src/com/gitblit/utils/SyndicationUtils.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java
index 6ba8d73..061d12a 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/com/gitblit/utils/SyndicationUtils.java
@@ -97,8 +97,14 @@
}
SyndContent content = new SyndContentImpl();
- content.setType(entryModel.contentType);
- content.setValue(entryModel.content);
+ if (StringUtils.isEmpty(entryModel.contentType)
+ || entryModel.contentType.equalsIgnoreCase("text/plain")) {
+ content.setType("text/html");
+ content.setValue(StringUtils.breakLinesForHtml(entryModel.content));
+ } else {
+ content.setType(entryModel.contentType);
+ content.setValue(entryModel.content);
+ }
entry.setDescription(content);
entries.add(entry);
@@ -167,9 +173,9 @@
* @return a list of SyndicationModel entries
* @throws {@link IOException}
*/
- public static List<FeedEntryModel> readSearchFeed(String url, String repository,
- String branch, String fragment, Constants.SearchType searchType, int numberOfEntries,
- int page, String username, char[] password) throws IOException {
+ public static List<FeedEntryModel> readSearchFeed(String url, String repository, String branch,
+ String fragment, Constants.SearchType searchType, int numberOfEntries, int page,
+ String username, char[] password) throws IOException {
// determine parameters
List<String> parameters = new ArrayList<String>();
parameters.add("s=" + StringUtils.encodeURL(fragment));
--
Gitblit v1.9.1