Merge develop into 3011_hcard_vcard

[friendica.git] / mod / attach.php

diff --git a/mod/attach.php b/mod/attach.php
index ae6540201e70f96227a1bf633aec78deaed4384e..03f850f0d1749972d7e68e63de295007bf856cb5 100644 (file)
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -34,9 +34,16 @@ function attach_init(&$a) {
                return;
        }
 
+       // Use quotes around the filename to prevent a "multiple Content-Disposition"
+       // error in Chrome for filenames with commas in them
        header('Content-type: ' . $r[0]['filetype']);
-       header('Content-disposition: attachment; filename=' . $r[0]['filename']);
+       header('Content-length: ' . $r[0]['filesize']);
+       if(isset($_GET['attachment']) && $_GET['attachment'] === '0')
+               header('Content-disposition: filename="' . $r[0]['filename'] . '"');
+       else
+               header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
+
        echo $r[0]['data'];
        killme();
        // NOTREACHED
-}
\ No newline at end of file
+}