Updated Branches: refs/heads/master b1d3401c3 -> cfac7388c
Escapes error messages Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cfac7388 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cfac7388 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cfac7388 Branch: refs/heads/master Commit: cfac7388c58f4d9bd601b31508aae49e54af5a8f Parents: b1d3401 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Jan 15 11:03:21 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Jan 15 11:03:21 2014 +0100 ---------------------------------------------------------------------- .../resources/org/apache/struts2/dispatcher/error.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/cfac7388/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl index 1b89aad..090bb92 100644 --- a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl +++ b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl @@ -65,17 +65,17 @@ <ol> <#list msgs as msg> <#if (msg?is_method)> - <li>${msg[0]}</li> + <li>${msg[0]?html}</li> <#else> - <li>${msg}</li> + <li>${msg?html}</li> </#if> </#list> </ol> <#elseif (msgs?size == 1)> <#if (msgs[0]?is_method)> - <li>${msgs[0][0]}</li> + <li>${msgs[0][0]?html}</li> <#else> - <li>${msgs[0]}</li> + <li>${msgs[0]?html}</li> </#if> </#if> </td> @@ -126,11 +126,11 @@ <h3>Stacktraces</h3> <#list chain as ex> <div class="stacktrace" style="padding-left: ${ex_index * 2}em"> - <strong>${ex}</strong> + <strong>${ex?html}</strong> <div> <pre> <#list ex.stackTrace as frame> - ${frame} + ${frame?html} </#list> </pre> </div>
