aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2018-11-09 22:17:11 +0100
committerMax Kostikov <max@kostikov.co>2018-11-09 22:17:11 +0100
commitdc59561a95f8354209f423a07bfd7fb3381f3633 (patch)
treee4298ba1ef62425727aa12f68070a589293b25f1 /Zotlabs/Module
parent4bf3fdd898446649928c27a25a18ea73d9cd8091 (diff)
downloadvolse-hubzilla-dc59561a95f8354209f423a07bfd7fb3381f3633.tar.gz
volse-hubzilla-dc59561a95f8354209f423a07bfd7fb3381f3633.tar.bz2
volse-hubzilla-dc59561a95f8354209f423a07bfd7fb3381f3633.zip
Fixed timezone conversion
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Photo.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index e218d1c53..6d2c400a9 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)) {
@@ -261,7 +261,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 . "Z") . " GMT");
header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data)));
// If it's a file resource, stream it.