Fixed generated urls in RSS feeds for grouped repositories

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 43cce71bc86bd6506d2058a48c16d26b0f8ae8d6..fc56876a55951e7a75e830aaee66238fafe68d5a 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -12,6 +12,7 @@ If you are updating from an earlier release AND you have indexed branches with t
 #### fixes\r
 \r
 - Fixed generated urls in Groovy *sendmail* hook script for grouped repositories\r
+- Fixed generated urls in RSS feeds for grouped repositories\r
 - Eliminated an unnecessary reopsitory enumeration call on the root page which should result in faster page loads (issue 103) \r
 - Gitblit could not delete a Lucene index in a working copy on index upgrade \r
 - Do not index submodule links (issue 119)\r

diff --git a/src/com/gitblit/SyndicationServlet.java b/src/com/gitblit/SyndicationServlet.java
index f9ae4e6de767e86d0c5a574af8356001183806bd..81cfb7686e2944ccc9de5e11678401fc270f7317 100644 (file)
--- a/src/com/gitblit/SyndicationServlet.java
+++ b/src/com/gitblit/SyndicationServlet.java
@@ -181,13 +181,14 @@ public class SyndicationServlet extends HttpServlet {
                        urlPattern = "{0}/commit/?r={1}&h={2}";\r
                }\r
                String gitblitUrl = HttpUtils.getGitblitURL(request);\r
+               char fsc = GitBlit.getChar(Keys.web.forwardSlashCharacter, '/');\r
                // convert RevCommit to SyndicatedEntryModel\r
                for (RevCommit commit : commits) {\r
                        FeedEntryModel entry = new FeedEntryModel();\r
                        entry.title = commit.getShortMessage();\r
                        entry.author = commit.getAuthorIdent().getName();\r
                        entry.link = MessageFormat.format(urlPattern, gitblitUrl,\r
-                                       StringUtils.encodeURL(model.name), commit.getName());\r
+                                       StringUtils.encodeURL(model.name.replace('/', fsc)), commit.getName());\r
                        entry.published = commit.getCommitterIdent().getWhen();\r
                        entry.contentType = "text/html";\r
                        String message = GitBlit.self().processCommitMessage(model.name,\r