aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Photo.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-05-05 19:42:00 -0700
committerzotlabs <mike@macgirvin.com>2020-05-05 19:42:00 -0700
commit79968ea07aa205e9c93993724d3f37362220b9d4 (patch)
tree053bbcc9c213bd2e1da2b4a1c464be771929b2c3 /Zotlabs/Module/Photo.php
parent7a0d9a449492ff3b5ef97b997310ed26ec1f53e4 (diff)
parent06d1cf83d2b1acfef5529fe388d2502bea381881 (diff)
downloadvolse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.tar.gz
volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.tar.bz2
volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Photo.php')
-rw-r--r--Zotlabs/Module/Photo.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 48e2bf4a5..1cf082bdd 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -213,7 +213,7 @@ class Photo extends \Zotlabs\Web\Controller {
if(! $data)
killme();
-
+
$etag = '"' . md5($data . $modified) . '"';
if($modified == 0)
@@ -269,7 +269,7 @@ class Photo extends \Zotlabs\Web\Controller {
// in the event that infrastructure caching is present.
$smaxage = intval($maxage/12);
- header("Cache-Control: s-maxage=" . $smaxage . ", max-age=" . $maxage . $cachecontrol);
+ header("Cache-Control: no-cache, s-maxage=" . $smaxage . ", max-age=" . $maxage . $cachecontrol);
}