X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fattach.php;h=94cb75a386d2a7f6d7ae7681635a495d8f39d7ad;hb=de689583e2741a2caee0e266a19a07d1ad4ed043;hp=76d60a6907167bcfc28d03276adb773c0e216140;hpb=ceaedb41e4ee00cab53befebd6ba58a5e2e7b5c4;p=friendica.git

diff --git a/mod/attach.php b/mod/attach.php
index 76d60a6907..94cb75a386 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -16,7 +16,7 @@ function attach_init(&$a) {
 	$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
 		intval($item_id)
 	);
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Item was not found.'). EOL);
 		return;
 	}
@@ -29,7 +29,7 @@ function attach_init(&$a) {
 		dbesc($item_id)
 	);
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -37,7 +37,12 @@ function attach_init(&$a) {
 	// 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