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 c8ec2f8cad16bc33a2bd2578d9f91dc949e8490e..c282695b05a640703b74a5fd441d2bfe87435d2f 100644 (file)
--- 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)) {\r
                        desc = getString("gb.noDescriptionGiven");\r
                } else {\r
-                       String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);\r
+                       String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.body);\r
                        desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);\r
                }\r
                add(new Label("ticketDescription", desc).setEscapeModelStrings(false));\r
@@ -507,7 +507,7 @@ public class TicketPage extends RepositoryPage {
                        add(new Label("ticketTopic").setVisible(false));\r
                } else {\r
                        // process the topic using the bugtraq config to link things\r
-                       String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);\r
+                       String topic = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.topic);\r
                        add(new Label("ticketTopic", topic).setEscapeModelStrings(false));\r
                }\r
 \r
@@ -686,7 +686,7 @@ public class TicketPage extends RepositoryPage {
                                                /*\r
                                                 * COMMENT\r
                                                 */\r
-                                               String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, entry.comment.text);\r
+                                               String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, entry.comment.text);\r
                                                String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);\r
                                                Fragment frag = new Fragment("entry", "commentFragment", this);\r
                                                Label commentIcon = new Label("commentIcon");\r

diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index ab763b8f4ec51450d10069f382d064d8896a4db7..1ca483ceb6de51cb382600f764d555a729a00dec 100644 (file)
--- 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);