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

(refs #1031)Fix issue link processing in Markdown

Browse Source
This commit is contained in:
Naoki Takezoe
2016-01-16 22:14:45 +09:00
parent 9b3e8bd22b
commit 0ab28e6daa
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/view/Markdown.scala
View File

@@ -33,13 +33,9 @@ object Markdown {
enableTaskList: Boolean = false, enableTaskList: Boolean = false,
hasWritePermission: Boolean = false, hasWritePermission: Boolean = false,
pages: List[String] = Nil)(implicit context: Context): String = { pages: List[String] = Nil)(implicit context: Context): String = {
// escape issue id
val s = if(enableRefsLink){
markdown.replaceAll("(?<=(\\W|^))#(\\d+)(?=(\\W|$))", "issue:$2")
} else markdown
// escape task list // escape task list
val source = if(enableTaskList) escapeTaskList(s) else s val source = if(enableTaskList) escapeTaskList(markdown) else markdown
val options = new Options() val options = new Options()
options.setSanitize(true) options.setSanitize(true)
@@ -112,7 +108,7 @@ object Markdown {
override def text(text: String): String = { override def text(text: String): String = {
// convert commit id and username to link. // convert commit id and username to link.
val t1 = if(enableRefsLink) convertRefsLinks(text, repository, "issue:", false) else text val t1 = if(enableRefsLink) convertRefsLinks(text, repository, "#", false) else text
// convert task list to checkbox. // convert task list to checkbox.
val t2 = if(enableTaskList) convertCheckBox(t1, hasWritePermission) else t1 val t2 = if(enableTaskList) convertCheckBox(t1, hasWritePermission) else t1