aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Attach.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-02 11:02:15 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-02 11:02:15 +0200
commitf23bdde464ef20ad2ffcb3984cc9481955374809 (patch)
tree5f1d46f3f513ecf2d788b842c0dd01cbd9ac1a99 /Zotlabs/Module/Attach.php
parentc1039977f1d64611d2c793f3aded96d031b74183 (diff)
parent05d9e1bee565ac0448c779a00d8d637341390cf7 (diff)
downloadvolse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.gz
volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.bz2
volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Attach.php')
-rw-r--r--Zotlabs/Module/Attach.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Attach.php b/Zotlabs/Module/Attach.php
index 8948b66d7..de941d52c 100644
--- a/Zotlabs/Module/Attach.php
+++ b/Zotlabs/Module/Attach.php
@@ -40,7 +40,7 @@ class Attach extends \Zotlabs\Web\Controller {
header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"');
if(intval($r['data']['os_storage'])) {
- $fname = dbunescbin($r['data']['data']);
+ $fname = dbunescbin($r['data']['content']);
if(strpos($fname,'store') !== false)
$istream = fopen($fname,'rb');
else
@@ -53,7 +53,7 @@ class Attach extends \Zotlabs\Web\Controller {
}
}
else
- echo dbunescbin($r['data']['data']);
+ echo dbunescbin($r['data']['content']);
killme();
}