harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-photo' into 'dev'

Browse Source 
$data only contains the link to the image if the image is in os storage. The…

See merge request hubzilla/core!1379
This commit is contained in:
M. Dent 2018-11-08 11:25:36 +01:00
commit 6013814cf4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Photo.php
View File

@ -165,6 +165,7 @@ class Photo extends \Zotlabs\Web\Controller {
if($exists && $allowed) { if($exists && $allowed) {
$data = dbunescbin($e[0]['content']); $data = dbunescbin($e[0]['content']);
$filesize = $e[0]['filesize'];
$mimetype = $e[0]['mimetype']; $mimetype = $e[0]['mimetype'];
$modified = strtotime($e[0]['edited']); $modified = strtotime($e[0]['edited']);
if(intval($e[0]['os_storage'])) if(intval($e[0]['os_storage']))
@ -261,7 +262,7 @@ class Photo extends \Zotlabs\Web\Controller {
} }
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT");
header("Content-Length: " . strlen($data)); header("Content-Length: " . $filesize);
// If it's a file resource, stream it. // If it's a file resource, stream it.