This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 6a20fb4adbfd2046b0c2e7ddf772459915616236 Author: juanpablo <[email protected]> AuthorDate: Wed Jan 22 23:32:05 2020 +0100 JSPWIKI-1127: remove absolute parameter from wiki:Link tags --- jspwiki-war/src/main/webapp/rss.jsp | 4 ---- jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp | 2 +- jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp | 2 +- jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp | 2 +- jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/jspwiki-war/src/main/webapp/rss.jsp b/jspwiki-war/src/main/webapp/rss.jsp index d58c2c2..e528bb9 100644 --- a/jspwiki-war/src/main/webapp/rss.jsp +++ b/jspwiki-war/src/main/webapp/rss.jsp @@ -79,10 +79,6 @@ if( type == null || !(type.equals(RSSGenerator.RSS10) || type.equals(RSSGenerator.RSS20) || type.equals(RSSGenerator.ATOM)) ) type = RSSGenerator.RSS20; - // Force the TranslatorReader to output absolute URLs - // regardless of the current settings. - wikiContext.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" ); - // Set the content type and include the response content response.setContentType( RSSGenerator.getContentType(type)+"; charset=UTF-8"); diff --git a/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp b/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp index 6ff5611..bc88026 100644 --- a/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp @@ -35,7 +35,7 @@ <div id="addattachment"> <h3><fmt:message key="attach.add"/></h3> <wiki:Permission permission="upload"> - <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>" + <form action="<wiki:Link jsp='attach' format='url'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>" class="wikiform" id="uploadform" method="post" diff --git a/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp b/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp index 7d02d4a..57baec4 100644 --- a/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp @@ -280,7 +280,7 @@ <h3><fmt:message key="info.uploadnew"/></h3> <wiki:Permission permission="upload"> - <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>" + <form action="<wiki:Link jsp='attach' format='url'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>" class="wikiform" id="uploadform" onsubmit="return Wiki.submitUpload(this, '<%=progressId%>');" diff --git a/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp b/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp index 20ddf24..634df52 100644 --- a/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp @@ -36,7 +36,7 @@ <div class="page-content"> <wiki:Permission permission="upload"> - <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='${progressId}'/></wiki:Link>" + <form action="<wiki:Link jsp='attach' format='url'><wiki:Param name='progressid' value='${progressId}'/></wiki:Link>" class="accordion<wiki:HasAttachments></wiki:HasAttachments>" id="uploadform" method="post" diff --git a/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp b/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp index bfda22b..3575a83 100644 --- a/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp @@ -252,7 +252,7 @@ <c:set var="progressId" value="<%= c.getEngine().getProgressManager().getNewProgressIdentifier() %>" /> <wiki:Permission permission="upload"> - <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='${progressId}'/></wiki:Link>" + <form action="<wiki:Link jsp='attach' format='url'><wiki:Param name='progressid' value='${progressId}'/></wiki:Link>" class="accordion-close" id="uploadform" method="post" accept-charset="<wiki:ContentEncoding/>"
