diff options
| author | Mario <mario@mariovavti.com> | 2021-01-24 20:03:35 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-24 20:03:35 +0000 |
| commit | 77793e17c04b1f67c10a83e7877c36a8b11ddbaa (patch) | |
| tree | 293729c08f5f0193a6445f641b5ac09d43168d3b /Zotlabs/Module | |
| parent | e486442eb1fdda0c4efa7eafc6d876b3c2c4b0ea (diff) | |
| parent | 552796286e4a2a61cc6020b7aa785dc88553e2d0 (diff) | |
| download | volse-hubzilla-77793e17c04b1f67c10a83e7877c36a8b11ddbaa.tar.gz volse-hubzilla-77793e17c04b1f67c10a83e7877c36a8b11ddbaa.tar.bz2 volse-hubzilla-77793e17c04b1f67c10a83e7877c36a8b11ddbaa.zip | |
Merge branch 'dev' into 'dev'
Add support filesystem storage for xchan profile photos
See merge request hubzilla/core!1898
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Photo.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 041bdf5a2..ee360dac5 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -194,9 +194,9 @@ class Photo extends \Zotlabs\Web\Controller { $mimetype = $e[0]['mimetype']; $modified = strtotime($e[0]['edited'] . 'Z'); - if(intval($e[0]['os_storage'])) { + if(intval($e[0]['os_storage'])) $streaming = $data; - } + if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') $prvcachecontrol = 'no-store, no-cache, must-revalidate'; } @@ -282,7 +282,7 @@ class Photo extends \Zotlabs\Web\Controller { header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data))); // If it's a file resource, stream it. - if($streaming && $channel) { + if($streaming) { if(strpos($streaming,'store') !== false) $istream = fopen($streaming,'rb'); else |