Author: hermanns
Date: Mon Mar 27 11:58:54 2006
New Revision: 389241
URL: http://svn.apache.org/viewcvs?rev=389241&view=rev
Log:
URL tag - includeParams default is "none", but docs states "get" is the default
Issue number: WW-1266
Obtained from: Nils-Helge Garli
Reviewed by: Rainer Hermanns
Modified:
incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java
Modified:
incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java?rev=389241&r1=389240&r2=389241&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java
(original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java
Mon Mar 27 11:58:54 2006
@@ -171,9 +171,11 @@
}
private void includeGetParameters() {
- String query = extractQueryString();
- if (query != null) {
- mergeRequestParameters(parameters,
HttpUtils.parseQueryString(query));
+ if(!(DispatcherUtils.isPortletSupportActive() &&
PortletActionContext.isPortletRequest())) {
+ String query = extractQueryString();
+ if (query != null) {
+ mergeRequestParameters(parameters,
HttpUtils.parseQueryString(query));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
