Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-13 00:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #811)Remove html tags from title of atom feed

Browse Source
This commit is contained in:
Naoki Takezoe
2015-07-05 22:15:39 +09:00
parent 88f3ee4b13
commit 59e826b630
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/gitbucket/core/view/helpers.scala
View File

@@ -155,6 +155,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
.replaceAll("\\[commit:([^\\s]+?)/([^\\s]+?)\\@([^\\s]+?)\\]", (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/commit/${m.group(3)}">${m.group(1)}/${m.group(2)}@${m.group(3).substring(0, 7)}</a>""") .replaceAll("\\[commit:([^\\s]+?)/([^\\s]+?)\\@([^\\s]+?)\\]", (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/commit/${m.group(3)}">${m.group(1)}/${m.group(2)}@${m.group(3).substring(0, 7)}</a>""")
) )
/**
* Remove html tags from the given Html instance.
*/
def removeHtml(html: Html): Html = Html(html.body.replaceAll("<.+?>", ""))
/** /**
* URL encode except '/'. * URL encode except '/'.
*/ */

2
src/main/twirl/gitbucket/core/helper/feed.scala.xml
View File

@@ -16,7 +16,7 @@
<published>@datetimeRFC3339(activity.activityDate)</published> <published>@datetimeRFC3339(activity.activityDate)</published>
<updated>@datetimeRFC3339(activity.activityDate)</updated> <updated>@datetimeRFC3339(activity.activityDate)</updated>
<link type="text/html" rel="alternate" href="@context.baseUrl/@activity.userName/@activity.repositoryName" /> <link type="text/html" rel="alternate" href="@context.baseUrl/@activity.userName/@activity.repositoryName" />
<title type="html">@activityMessage(activity.message)</title> <title type="html">@removeHtml(activityMessage(activity.message))</title>
<author> <author>
<name>@activity.activityUserName</name> <name>@activity.activityUserName</name>
<uri>@url(activity.activityUserName)</uri> <uri>@url(activity.activityUserName)</uri>