diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-10 07:36:51 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-10 07:36:51 +0100 |
| commit | b782c46e518afd0713f92fabb76aea9a7c3e5d77 (patch) | |
| tree | c28dc5d4f45988a01c56876d1ae41d92a73d6191 /mod/attach.php | |
| parent | eaa47760bc7bb024b4c41bd41be62fd16f1237ec (diff) | |
| parent | 7ec687988746e1037d86d25186c2dd5f2addb15b (diff) | |
| download | volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.tar.gz volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.tar.bz2 volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/attach.php')
| -rw-r--r-- | mod/attach.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/attach.php b/mod/attach.php index ad5dead07..306e39519 100644 --- a/mod/attach.php +++ b/mod/attach.php @@ -37,7 +37,10 @@ function attach_init(&$a) { header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"'); if(intval($r['data']['os_storage'])) { $fname = dbunescbin($r['data']['data']); - $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname,'rb'); + if(strpos($fname,'store') !== false) + $istream = fopen($fname,'rb'); + else + $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname,'rb'); $ostream = fopen('php://output','wb'); if($istream && $ostream) { pipe_streams($istream,$ostream); |