This is an automated email from the ASF dual-hosted git repository.

mraible pushed a commit to branch roller-6.1.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 2f52062f8db4eeac74a7f941d699da4916230b0c
Merge: 8e71ad23e 3812728dd
Author: Matt Raible <[email protected]>
AuthorDate: Tue Nov 17 20:39:21 2026 -0700

    Merge pull request #330 from apache/escape-user-display-names-6.1.x
    
    Escape user names, commenter details and tag names where they are output

 app/pom.xml                                        |   7 +
 .../weblogger/pojos/wrapper/UserWrapper.java       |  25 +++-
 .../pojos/wrapper/WeblogEntryCommentWrapper.java   |  36 ++++-
 .../ui/struts2/ajax/CommentDataServlet.java        |   7 +-
 .../weblogger/ui/struts2/ajax/UserDataServlet.java |   2 +
 .../org/apache/roller/weblogger/util/MailUtil.java |   9 +-
 .../apache/roller/weblogger/util/Utilities.java    |  49 ++++---
 .../webservices/tagdata/TagDataServlet.java        |   7 +-
 .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp |  20 ++-
 .../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp  |   8 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp     |   6 +-
 .../main/webapp/WEB-INF/jsps/editor/Comments.jsp   |   4 +-
 app/src/main/webapp/WEB-INF/velocity/feeds.vm      |   4 +-
 .../weblogger/pojos/wrapper/UserWrapperTest.java   |  67 +++++++++
 .../wrapper/WeblogEntryCommentWrapperTest.java     |  70 +++++++++
 .../rendering/velocity/FeedAuthorEscapingTest.java | 163 +++++++++++++++++++++
 .../ui/struts2/ajax/CommentDataServletTest.java    |  43 ++++++
 .../ui/struts2/ajax/UserDataServletTest.java       |  24 ++-
 .../ui/struts2/util/JspOutputEncodingTest.java     |  20 +++
 .../util/MailUtilCommentNotificationTest.java      | 100 +++++++++++++
 .../roller/weblogger/util/UtilitiesTest.java       |  35 ++++-
 .../webservices/tagdata/TagDataServletTest.java    | 122 +++++++++++++++
 22 files changed, 768 insertions(+), 60 deletions(-)

Reply via email to