From ec5a889c907af30afeba527def2d9f836eecbec4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 03 Nov 2011 08:50:47 -0400 Subject: [PATCH] Feeds and Manager must respect a server's web.mountParameters setting --- src/com/gitblit/utils/SyndicationUtils.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java index 8987c26..d9d1d84 100644 --- a/src/com/gitblit/utils/SyndicationUtils.java +++ b/src/com/gitblit/utils/SyndicationUtils.java @@ -51,6 +51,7 @@ * Outputs an RSS feed of the list of entries to the outputstream. * * @param hostUrl + * @param feedLink * @param title * @param description * @param repository @@ -59,16 +60,15 @@ * @throws IOException * @throws FeedException */ - public static void toRSS(String hostUrl, String title, String description, String repository, - List<SyndicatedEntryModel> entryModels, OutputStream os) throws IOException, - FeedException { + public static void toRSS(String hostUrl, String feedLink, String title, String description, + String repository, List<SyndicatedEntryModel> entryModels, OutputStream os) + throws IOException, FeedException { SyndFeed feed = new SyndFeedImpl(); feed.setFeedType("rss_2.0"); feed.setEncoding("UTF-8"); feed.setTitle(title); - feed.setLink(MessageFormat.format("{0}/summary/{1}", hostUrl, - StringUtils.encodeURL(repository))); + feed.setLink(feedLink); feed.setDescription(description); SyndImageImpl image = new SyndImageImpl(); image.setTitle(Constants.NAME); -- Gitblit v1.9.1