diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-11-10 12:22:09 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-11-10 12:22:09 +0100 |
| commit | 750d6f4be93a6b638d55cba8d9f22d4b93a83fce (patch) | |
| tree | 04374432514b1259a0e045588ded09ff346e03e3 /Zotlabs | |
| parent | fc5dc9717a707438de91b3c42a1edc3a39aa6022 (diff) | |
| parent | c6e14a696e7942c26319b57f197826018b427002 (diff) | |
| download | volse-hubzilla-750d6f4be93a6b638d55cba8d9f22d4b93a83fce.tar.gz volse-hubzilla-750d6f4be93a6b638d55cba8d9f22d4b93a83fce.tar.bz2 volse-hubzilla-750d6f4be93a6b638d55cba8d9f22d4b93a83fce.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
| -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 e218d1c53..95e3404fb 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -80,7 +80,7 @@ class Photo extends \Zotlabs\Web\Controller { intval(PHOTO_PROFILE) ); if($r) { - $modified = strtotime($r[0]['edited']); + $modified = strtotime($r[0]['edited'] . "Z"); $data = dbunescbin($r[0]['content']); $mimetype = $r[0]['mimetype']; } @@ -167,7 +167,7 @@ class Photo extends \Zotlabs\Web\Controller { $data = dbunescbin($e[0]['content']); $filesize = $e[0]['filesize']; $mimetype = $e[0]['mimetype']; - $modified = strtotime($e[0]['edited']); + $modified = strtotime($e[0]['edited'] . 'Z'); 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'] != '') @@ -193,7 +193,7 @@ class Photo extends \Zotlabs\Web\Controller { header_remove('Expires'); header_remove('Cache-Control'); header_remove('Set-Cookie'); - http_status_exit(304,'not modified'); + http_status_exit(304,'not modified'); } if(! isset($data)) { |