Merged #181 "Sanitize ticket text at presentation time to avoid unintended html encoding"

1 files changed, 3 insertions, 5 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
index 21a2af10..e6d9cb1e 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
@@ -49,8 +49,6 @@ import com.gitblit.tickets.TicketNotifier;
 import com.gitblit.tickets.TicketResponsible;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.GitBlitWebSession;

-import com.gitblit.wicket.SafeTextModel;

-import com.gitblit.wicket.SafeTextModel.Mode;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.MarkdownTextArea;

 

@@ -92,8 +90,8 @@ public class NewTicketPage extends RepositoryPage {
 		}

 

 		typeModel = Model.of(TicketModel.Type.defaultType);

-		titleModel = SafeTextModel.none();

-		topicModel = SafeTextModel.none();

+		titleModel = Model.of();

+		topicModel = Model.of();

 		mergeToModel = Model.of(Repository.shortenRefName(getRepositoryModel().mergeTo));

 		responsibleModel = Model.of();

 		milestoneModel = Model.of();

@@ -108,7 +106,7 @@ public class NewTicketPage extends RepositoryPage {
 		form.add(new TextField<String>("title", titleModel));

 		form.add(new TextField<String>("topic", topicModel));

 

-		final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);

+		final IModel<String> markdownPreviewModel = Model.of();

 		descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);

 		descriptionPreview.setEscapeModelStrings(false);

 		descriptionPreview.setOutputMarkupId(true);