From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 May 2014 21:26:21 +0000 (-0400)
Subject: Correct usage of bugtraq processor
X-Git-Tag: v1.6.0~61
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d07b16755045eeb28f3802e610c67325481ad5bf;p=gitblit.git

Correct usage of bugtraq processor
---

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index c8ec2f8c..c282695b 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -278,7 +278,7 @@ public class TicketPage extends RepositoryPage {
 		if (StringUtils.isEmpty(ticket.body)) {
 			desc = getString("gb.noDescriptionGiven");
 		} else {
-			String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);
+			String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.body);
 			desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);
 		}
 		add(new Label("ticketDescription", desc).setEscapeModelStrings(false));
@@ -507,7 +507,7 @@ public class TicketPage extends RepositoryPage {
 			add(new Label("ticketTopic").setVisible(false));
 		} else {
 			// process the topic using the bugtraq config to link things
-			String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);
+			String topic = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.topic);
 			add(new Label("ticketTopic", topic).setEscapeModelStrings(false));
 		}
 
@@ -686,7 +686,7 @@ public class TicketPage extends RepositoryPage {
 						/*
 						 * COMMENT
 						 */
-						String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, entry.comment.text);
+						String bugtraq = bugtraqProcessor().processText(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");
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index ab763b8f..1ca483ce 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -123,7 +123,7 @@ public class TicketListPanel extends BasePanel {
 					public void populateItem(final Item<String> labelItem) {
 						BugtraqProcessor btp  = new BugtraqProcessor(app().settings());
 						Repository db = app().repositories().getRepository(repository.name);
-						String content = btp.processPlainCommitMessage(db, repository.name, labelItem.getModelObject());
+						String content = btp.processText(db, repository.name, labelItem.getModelObject());
 						db.close();
 						Label label = new Label("label", content);
 						label.setEscapeModelStrings(false);