summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-15 13:28:49 -0400
committerJames Moger <james.moger@gitblit.com>2014-05-15 13:28:49 -0400
commit88730095c09fc5b9822a25aff919ca32f2a54508 (patch)
treed32d502801b6be658adda13815663a56a7cea257 /src/main/java
parentb584e43ef28751a5bcb83e5c4cbcfbac641d8bdc (diff)
downloadgitblit-88730095c09fc5b9822a25aff919ca32f2a54508.tar.gz
gitblit-88730095c09fc5b9822a25aff919ca32f2a54508.zip
Process bugtraq links in the ticket description and comments
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/wicket/pages/TicketPage.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index c066f24d..c8ec2f8c 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -278,7 +278,8 @@ public class TicketPage extends RepositoryPage {
if (StringUtils.isEmpty(ticket.body)) {
desc = getString("gb.noDescriptionGiven");
} else {
- desc = MarkdownUtils.transformGFM(app().settings(), ticket.body, ticket.repository);
+ String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);
+ desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);
}
add(new Label("ticketDescription", desc).setEscapeModelStrings(false));
@@ -685,7 +686,8 @@ public class TicketPage extends RepositoryPage {
/*
* COMMENT
*/
- String comment = MarkdownUtils.transformGFM(app().settings(), entry.comment.text, repositoryName);
+ String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, entry.comment.text);
+ String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);
Fragment frag = new Fragment("entry", "commentFragment", this);
Label commentIcon = new Label("commentIcon");
if (entry.comment.src == CommentSource.Email) {