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

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

commit 1d955b34d9ac8aa160be509a36eecbc2b28ddff4
Merge: 3bceae2a4 47b1a841a
Author: Matt Raible <[email protected]>
AuthorDate: Mon Nov 16 20:45:36 2026 -0700

    Merge pull request #298 from mraible/jsp-output-encoding

 .../roller/weblogger/ui/struts2/util/UIAction.java |  20 +++
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp     |  16 +--
 .../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp  |   2 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp     |   2 +-
 .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp    |   8 +-
 .../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp |   4 +-
 app/src/main/webapp/WEB-INF/jsps/core/Login.jsp    |   2 +-
 app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp |   8 +-
 app/src/main/webapp/WEB-INF/jsps/core/Register.jsp |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp  |  18 +--
 .../main/webapp/WEB-INF/jsps/editor/Categories.jsp |  14 +-
 .../main/webapp/WEB-INF/jsps/editor/Comments.jsp   |  24 ++--
 .../main/webapp/WEB-INF/jsps/editor/Entries.jsp    |   2 +-
 .../main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp  |   6 +-
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp     |   2 +-
 .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp    |   2 +-
 .../jsps/editor/MediaFileAddSuccessInclude.jsp     |   2 +-
 .../jsps/editor/MediaFileImageDimension.jsp        |   4 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp   |   6 +-
 .../main/webapp/WEB-INF/jsps/editor/Members.jsp    |   8 +-
 .../webapp/WEB-INF/jsps/editor/MembersSidebar.jsp  |   2 +-
 .../main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp  |   4 +-
 .../main/webapp/WEB-INF/jsps/tiles/userStatus.jsp  |   2 +-
 .../ui/struts2/util/JspOutputEncodingTest.java     | 159 +++++++++++++++++++++
 .../weblogger/ui/struts2/util/UIActionTest.java    |  35 +++++
 25 files changed, 284 insertions(+), 72 deletions(-)

Reply via email to