Updated Branches:
refs/heads/master cfac7388c -> 1cc2d6782
See JIRA: https://issues.apache.org/jira/browse/WW-4259
Change to ServletUrlRenderer to not escape an & twice when a query string in
included in the s:form tags action attribute (e.g.
action="TestAction?field1=one&field2=two"
Added a test for this use case to FormTagTest.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1cc2d678
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1cc2d678
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1cc2d678
Branch: refs/heads/master
Commit: 1cc2d67826698f6a95582570d5104a10f55976dc
Parents: cfac738
Author: phillips1021
Authored: Sun Jan 19 09:18:01 2014 -0600
Committer: phillips1021
Committed: Sun Jan 19 09:18:01 2014 -0600
--
.../struts2/components/ServletUrlRenderer.java | 2 +-
core/src/site/resources/tags/i18n.html | 96 ++--
.../struts2/views/jsp/ui/FormTagTest.java | 18
.../apache/struts2/views/jsp/ui/Formtag-26.txt | 1 +
4 files changed, 68 insertions(+), 49 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1cc2d678/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index e9429a9..df72d84 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -162,7 +162,7 @@ public class ServletUrlRenderer implements UrlRenderer {
ActionMapping mapping = new ActionMapping(actionName,
namespace, actionMethod, formComponent.parameters);
String result =
urlHelper.buildUrl(formComponent.actionMapper.getUriFromActionMapping(mapping),
-formComponent.request, formComponent.response,
actionParams, null, formComponent.includeContext, true);
+formComponent.request, formComponent.response,
actionParams, null, formComponent.includeContext, true, false, false);
formComponent.addParameter("action", result);
// let's try to get the actual action class and name
http://git-wip-us.apache.org/repos/asf/struts/blob/1cc2d678/core/src/site/resources/tags/i18n.html
--
diff --git a/core/src/site/resources/tags/i18n.html
b/core/src/site/resources/tags/i18n.html
index a022b8a..26b384a 100644
--- a/core/src/site/resources/tags/i18n.html
+++ b/core/src/site/resources/tags/i18n.html
@@ -1,48 +1,48 @@
-
-
-
- i18n
-
-
-
- Tag Name: i18n
- Description
-
-
- Get a resource bundle and place it on the value stack
-
-
-
- Attributes
-
-
-
- Dynamic Attributes
Allowed: false
-
-
-
-
-
- Name
- Required
- Default
- Evaluated
- Type
- Description
-
-
- name
- true
- String
- false
- String
- Name of
resource bundle to use (eg foo/bar/customBundle)
-
-
-
-
-
-
+
+
+
+ i18n
+
+
+
+ Tag Name: i18n
+ Description
+
+
+ Get a resource bundle and place it on the value stack
+
+
+
+ Attributes
+
+
+
+ Dynamic Attributes
Allowed: false
+
+
+
+
+
+ Name
+ Required
+ Default
+ Evaluated
+ Type
+ Descriptio
