You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by al...@apache.org on 2026/08/10 20:48:31 UTC
(jspwiki) branch bug/JSPWIKI-1275-2x created (now 8ac1fa883)
This is an automated email from the ASF dual-hosted git repository.
spyhunter99 pushed a change to branch bug/JSPWIKI-1275-2x
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
at 8ac1fa883 JSPWIKI-1275
This branch includes the following new commits:
new 8ac1fa883 JSPWIKI-1275
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jspwiki) 01/01: JSPWIKI-1275
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spyhunter99 pushed a commit to branch bug/JSPWIKI-1275-2x
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 8ac1fa8837d316835ead7cb1e86716f3a8a869fa
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Mon Aug 10 16:48:25 2026 -0400
JSPWIKI-1275
---
jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp | 2 +-
.../src/main/webapp/templates/default/EditGroupContent.jsp | 4 ++--
jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp b/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp
index 1f692c6e4..b9047ca4a 100644
--- a/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp
@@ -379,7 +379,7 @@
class="attachment" ><wiki:PageVersion /></wiki:Link></td>
--%>
<td><a href="<wiki:Link version='<%=Integer.toString(att.getVersion())%>' format='url' />"
- title="<%= name %>"
+ title="<%= TextTextUtil.replaceEntities(name) %>"
class="attachment" ><wiki:PageVersion /></a></td>
<td style="white-space:nowrap;text-align:right;">
<fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0) %>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp b/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
index dbb7f1580..8e4f7920f 100644
--- a/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
@@ -55,8 +55,8 @@
}
%>
-<c:set var="name" value="<%= name%>" />
-<c:set var="members" value="<%= membersAsString%>" />
+<c:set var="name" value="<%=TextUtil.replaceEntities(name)%>" />
+<c:set var="members" value="<%= TextUtil.replaceEntities(membersAsString)%>" />
<div class="page-content">
diff --git a/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp b/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
index bc52488b9..a9d99d286 100644
--- a/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
@@ -57,7 +57,7 @@
StringBuffer membersAsString = null;
%>
-<c:set var="groups" value="<%= groups %>" />
+<c:set var="groups" value="<%=TextUtil.replaceEntities(groups) %>" />
<wiki:CheckRequestContext context="!createGroup"><c:set var="createFormClose" value="-close"/></wiki:CheckRequestContext>
<wiki:Permission permission="createGroups">
@@ -136,14 +136,14 @@
Arrays.sort( members, new PrincipalComparator() );
pageContext.setAttribute("members", members);
%>
- <c:set var="group" value="<%= group %>" />
+ <c:set var="group" value="<%= TextUtil.replaceEntities(group) %>" />
<tr class="${param.group == group.name ? 'highlight' : ''}">
<%--<td><wiki:Link jsp='Group.jsp'><wiki:Param name='group' value='${group.name}'/>${group.name}</wiki:Link></td>--%>
- <td><c:if test="${group.name =='Admin'}"><span class="icon-unlock-alt"></span> </c:if>${group.name}</td>
+ <td><c:if test="${group.name =='Admin'}"><span class="icon-unlock-alt"></span> </c:if>${TextUtil.replaceEntities(group.name)}</td>
<td>
<c:forEach items="${members}" var="member" varStatus="iterator">
<c:if test="${iterator.index > 0}">, </c:if>
- ${member.name}
+ ${TextUtil.replaceEntities(member.name)}
</c:forEach>
</td>
<td><fmt:formatDate value="${group.created}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
@@ -158,7 +158,7 @@
<c:if test='<%= authMgr.checkPermission( c.getWikiSession(), new GroupPermission( name, "edit" ) ) %>'>
<%-- <wiki:Permission permission="editGroup"> --%>
<a class="btn btn-xs btn-primary"
- href="<wiki:Link format='url' jsp='EditGroup.jsp'><wiki:Param name='group' value='${group.name}' /></wiki:Link>" >
+ href="<wiki:Link format='url' jsp='EditGroup.jsp'><wiki:Param name='group' value='${TextUtil.replaceEntities(group.name)}' /></wiki:Link>" >
<fmt:message key="actions.editgroup" />
</a>
<%--</wiki:Permission>--%>
@@ -166,7 +166,7 @@
<c:if test='<%= authMgr.checkPermission( c.getWikiSession(), new GroupPermission( name, "delete" ) ) %>'>
<%-- <wiki:Permission permission="deleteGroup"> --%>
- <button class="btn btn-xs btn-danger" type="button" onclick="document.deleteGroupForm.group.value ='${group.name}';document.deleteGroupForm.ok.click();">
+ <button class="btn btn-xs btn-danger" type="button" onclick="document.deleteGroupForm.group.value ='${TextUtil.replaceEntities(group.name)}';document.deleteGroupForm.ok.click();">
<fmt:message key="actions.deletegroup"/>
</button>
<%--</wiki:Permission>--%>