You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/08/25 12:27:53 UTC

svn commit: r240040 - /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java

Author: cziegeler
Date: Thu Aug 25 03:27:49 2005
New Revision: 240040

URL: http://svn.apache.org/viewcvs?rev=240040&view=rev
Log:
Fix CopletTransformer "multipart/form-data" enctype handling. Applied patch submitted by Frank Taffelt <fr...@interface-business.de> (Bug 36335) 

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java?rev=240040&r1=240039&r2=240040&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java Thu Aug 25 03:27:49 2005
@@ -204,7 +204,7 @@
             newAttrs.setAttributes(attr);
             newAttrs.removeAttribute("format");
             this.stack.push(newAttrs);
-            
+
             String format = attr.getValue("format");
             if ( format == null ) {
                 format = "html-link";
@@ -248,7 +248,7 @@
                     separator = '&';
                 }
                 href = baseURL + separator + href.substring(pos);
-                
+
             }
             this.output(href, format, newAttrs );
 
@@ -287,8 +287,9 @@
             boolean addParametersAsHiddenFields = false;
             String parameters = null;
             final String enctype = newAttrs.getValue("enctype");
-            if ( enctype== null 
-                 || "application/x-www-form-urlencoded".equals(enctype) )  {
+            if ( enctype== null
+                || "application/x-www-form-urlencoded".equalsIgnoreCase(enctype)
+                || "multipart/form-data".equalsIgnoreCase(enctype) )  {
                 final int pos = uri.indexOf('?');
                 if ( pos != -1 ) {
                     parameters = uri.substring(pos+1);