diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-17 12:09:19 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-17 12:09:19 -0600 |
| commit | 802a6b05e5850161f740366cb59a182a96abe069 (patch) | |
| tree | 43b9cc96eb349cb7e36b80e4a6a3ebf2d85c2222 /src/main/java/com/gitblit/wicket/panels/CommentPanel.java | |
| parent | 18d3e302f595b14ef87420305af56738490730cb (diff) | |
| parent | a5962734a421184fef072d805424e15518633973 (diff) | |
| download | gitblit-802a6b05e5850161f740366cb59a182a96abe069.tar.gz gitblit-802a6b05e5850161f740366cb59a182a96abe069.zip | |
Merged #181 "Sanitize ticket text at presentation time to avoid unintended html encoding"
Diffstat (limited to 'src/main/java/com/gitblit/wicket/panels/CommentPanel.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/panels/CommentPanel.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/CommentPanel.java b/src/main/java/com/gitblit/wicket/panels/CommentPanel.java index 130e7336..acf4dd9a 100644 --- a/src/main/java/com/gitblit/wicket/panels/CommentPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/CommentPanel.java @@ -19,14 +19,13 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; import com.gitblit.models.TicketModel.Change; import com.gitblit.models.UserModel; -import com.gitblit.wicket.SafeTextModel; -import com.gitblit.wicket.SafeTextModel.Mode; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.BasePage; @@ -90,7 +89,7 @@ public class CommentPanel extends BasePanel { } }.setVisible(ticket != null && ticket.number > 0)); - final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none); + final IModel<String> markdownPreviewModel = Model.of(); markdownPreview = new Label("markdownPreview", markdownPreviewModel); markdownPreview.setEscapeModelStrings(false); markdownPreview.setOutputMarkupId(true); |