Skip to content

JSPWIKI-1284 see jira for details #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spyhunter99 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JSPWIKI-1284 see jira for details #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<form action="<wiki:Link format='url' jsp='Wiki.jsp'/>"
method="get" accept-charset='UTF-8'>

<input type="hidden" name="page" value="${param.page}" />
<input type="hidden" name="page" value="${fn:escapeXml(param.page)}" />
<wiki:CsrfProtection/>
<div class="error center">
<label>
Expand Down
5 changes: 3 additions & 2 deletions jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
Expand All @@ -29,8 +30,8 @@

<c:set var="isweblog"><%= ( String )Context.findContext( pageContext ).getPage().getAttribute( /*ATTR_ISWEBLOG*/ "weblogplugin.isweblog" ) %></c:set>
<c:if test="${isweblog}">
<wiki:Calendar pageformat="'${param.page}_blogentry_'ddMMyy'_'" addindex="true"
urlformat="'Wiki.jsp?page=${param.page}&weblog.startDate='ddMMyy'&weblog.days=1'"/>
<wiki:Calendar pageformat="'${fn:escapeXml(param.page)}_blogentry_'ddMMyy'_'" addindex="true"
urlformat="'Wiki.jsp?page=${fn:escapeXml(param.page)}&weblog.startDate='ddMMyy'&weblog.days=1'"/>
</c:if>

<wiki:Permission permission="view">
Expand Down
Loading