roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject roller git commit: Fix regression in comments page.
Date Sun, 21 Oct 2018 21:12:41 GMT
Repository: roller
Updated Branches:
  refs/heads/bootstrap-ui 593f9ba50 -> 2ec0cba5e


Fix regression in comments page.


Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/2ec0cba5
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/2ec0cba5
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/2ec0cba5

Branch: refs/heads/bootstrap-ui
Commit: 2ec0cba5e9541cacdf3dd2df8d186aa1a5488dda
Parents: 593f9ba
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sun Oct 21 17:12:38 2018 -0400
Committer: Dave Johnson <snoopdave@gmail.com>
Committed: Sun Oct 21 17:12:38 2018 -0400

----------------------------------------------------------------------
 app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/2ec0cba5/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
index 04b5e7f..1b0afe8 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
@@ -295,7 +295,7 @@
                                             <s:if test="#comment.content.length() >
1000">
                                                 <div class="bot" id="comment-<s:property
value="#comment.id"/>">
                                                     <str:truncateNicely upper="1000" appendToEnd="...">
-                                                        <s:property value="#comment.content"
escape="true"/>
+                                                        <s:property value="#comment.content"
escapeHtml="true"/>
                                                     </str:truncateNicely>
                                                 </div>
                                                 <div id="link-<s:property value="#comment.id"/>">
@@ -307,7 +307,7 @@
                                             <s:else>
                                                 <span width="200px"
                                                       id="comment-<s:property value="#comment.id"/>"><s:property
-                                                        value="#comment.content" escape="true"/></span>
+                                                        value="#comment.content" escapeHtml="true"/></span>
                                             </s:else>
                                         </div>
 


Mime
View raw message