Update of /var/cvs/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv4653

Modified Files:
      Tag: MMBase-1_8
        HandleServlet.java 
Log Message:
  MMB-1750


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/servlet
See also: http://www.mmbase.org/jira/browse/MMB-1750


Index: HandleServlet.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/servlet/Attic/HandleServlet.java,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -b -r1.29.2.2 -r1.29.2.3
--- HandleServlet.java  25 Nov 2008 09:01:06 -0000      1.29.2.2
+++ HandleServlet.java  9 Dec 2008 16:02:22 -0000       1.29.2.3
@@ -27,7 +27,7 @@
  * specialized servlets. The mime-type is always application/x-binary, forcing 
the browser to
  * download.
  *
- * @version $Id: HandleServlet.java,v 1.29.2.2 2008/11/25 09:01:06 sdeboer Exp 
$
+ * @version $Id: HandleServlet.java,v 1.29.2.3 2008/12/09 16:02:22 michiel Exp 
$
  * @author Michiel Meeuwissen
  * @since  MMBase-1.6
  * @see ImageServlet
@@ -131,17 +131,21 @@
     }
 
     /**
-     [EMAIL PROTECTED] MMBase-1.8.8
+     [EMAIL PROTECTED] MMBase-1.8.7
      */
     protected String getContentDisposition(QueryParts query, Node node, String 
def) {
         String fileNamePart = query.getFileName();
-        if(fileNamePart != null && fileNamePart.startsWith("/inline/")) {
+        if(fileNamePart != null) {
+            if (fileNamePart.startsWith("/inline/")) {
             return "inline";
-        } else {
+            }
+            if (fileNamePart.startsWith("/attachment/")) {
+                return "attachment";
+            }
+        }
             String cd = 
node.getNodeManager().getProperty("Content-Disposition");
             return cd == null ? def : cd;
         }
-    }
 
     /**
      * Sets the content disposition header.
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to