aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Photo.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-11-19 13:11:18 +0100
committerMario <mario@mariovavti.com>2018-11-19 13:11:18 +0100
commit73b836c73d6804bc29d7de89cd6397bfe857f9d7 (patch)
tree7e6c7c1a87f1609ecfd55161dce4f063c7031e2e /Zotlabs/Module/Photo.php
parentaf0c2f59cc1a51d2e1847682f6d66ab4dc600004 (diff)
downloadvolse-hubzilla-73b836c73d6804bc29d7de89cd6397bfe857f9d7.tar.gz
volse-hubzilla-73b836c73d6804bc29d7de89cd6397bfe857f9d7.tar.bz2
volse-hubzilla-73b836c73d6804bc29d7de89cd6397bfe857f9d7.zip
Revert "Fix return on wrong sotred in Content-Length size for full size photos"
This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408
Diffstat (limited to 'Zotlabs/Module/Photo.php')
-rw-r--r--Zotlabs/Module/Photo.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 91175c7df..30e8340e2 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -163,13 +163,11 @@ class Photo extends \Zotlabs\Web\Controller {
if($exists && $allowed) {
$data = dbunescbin($e[0]['content']);
+ $filesize = $e[0]['filesize'];
$mimetype = $e[0]['mimetype'];
$modified = strtotime($e[0]['edited'] . 'Z');
- if(intval($e[0]['os_storage'])) {
+ if(intval($e[0]['os_storage']))
$streaming = $data;
- }
- else
- $filesize = $e[0]['filesize'];
if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '')
$prvcachecontrol = true;
}