From 0ab28e6daaa969bd7efca5bdcb539a3aa494349f Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 16 Jan 2016 22:14:45 +0900 Subject: [PATCH] (refs #1031)Fix issue link processing in Markdown --- src/main/scala/gitbucket/core/view/Markdown.scala | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala index 99b5ca086..5acaa1de2 100644 --- a/src/main/scala/gitbucket/core/view/Markdown.scala +++ b/src/main/scala/gitbucket/core/view/Markdown.scala @@ -33,13 +33,9 @@ object Markdown { enableTaskList: Boolean = false, hasWritePermission: Boolean = false, 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 - val source = if(enableTaskList) escapeTaskList(s) else s + val source = if(enableTaskList) escapeTaskList(markdown) else markdown val options = new Options() options.setSanitize(true) @@ -112,7 +108,7 @@ object Markdown { override def text(text: String): String = { // 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. val t2 = if(enableTaskList) convertCheckBox(t1, hasWritePermission) else t1