diff options
| author | Mario <mario@mariovavti.com> | 2018-11-10 11:47:20 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-11-10 11:47:20 +0100 |
| commit | 4999547f87a1e151108402cbcffc37dc6706f88b (patch) | |
| tree | f7e6a6465d0d93e2c2a30e83fe8a2d61874f9b98 /Zotlabs/Module | |
| parent | 4bf3fdd898446649928c27a25a18ea73d9cd8091 (diff) | |
| parent | d20759c1419ae905e70c7bc6b8acaf3e3918d210 (diff) | |
| download | volse-hubzilla-4999547f87a1e151108402cbcffc37dc6706f88b.tar.gz volse-hubzilla-4999547f87a1e151108402cbcffc37dc6706f88b.tar.bz2 volse-hubzilla-4999547f87a1e151108402cbcffc37dc6706f88b.zip | |
Merge branch 'dev' into 'dev'
Preserve received image modification date on caching
See merge request hubzilla/core!1386
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 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)) { |