From c0d028b5fe76592f55c622c6e24cbe91de49a261 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 28 Sep 2015 10:25:59 -0400 Subject: [PATCH] Fixes #922: RSS feed link ignores forward-slash character --- src/main/java/com/gitblit/servlet/SyndicationServlet.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java index c6343d9..39dbf2e 100644 --- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java +++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import com.google.inject.Inject; -import com.google.inject.Singleton; import javax.servlet.http.HttpServlet; import org.eclipse.jgit.lib.ObjectId; @@ -48,6 +46,8 @@ import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; import com.gitblit.utils.SyndicationUtils; +import com.google.inject.Inject; +import com.google.inject.Singleton; /** * SyndicationServlet generates RSS 2.0 feeds and feed links. @@ -368,7 +368,7 @@ if (mountParameters) { // mounted url feedLink = MessageFormat.format("{0}/summary/{1}", gitblitUrl, - StringUtils.encodeURL(feedName)); + StringUtils.encodeURL(feedName.replace('/', fsc))); } else { // parameterized url feedLink = MessageFormat.format("{0}/summary/?r={1}", gitblitUrl, -- Gitblit v1.9.1