diff options
| author | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
| commit | 65d98af24c3c7b784f7e2c95998df65901011ce3 (patch) | |
| tree | d7d6a60698d7a0c3704ea55cb71c543285186b17 /Zotlabs/Module/Photo.php | |
| parent | a57739c462a7991bf2130e8eca0c383eb276f0cd (diff) | |
| parent | 62d35627f35537d0056482047e74a27ad837c3cf (diff) | |
| download | volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.tar.gz volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.tar.bz2 volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.zip | |
Merge branch '8.4RC'8.4
Diffstat (limited to 'Zotlabs/Module/Photo.php')
| -rw-r--r-- | Zotlabs/Module/Photo.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 10d2e8f47..fa87d96e5 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -271,7 +271,6 @@ class Photo extends \Zotlabs\Web\Controller { $modified = time(); header_remove('Pragma'); - if((isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag) || (!isset($_SERVER['HTTP_IF_NONE_MATCH']) && isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] === gmdate("D, d M Y H:i:s", $modified) . " GMT")) { header_remove('Expires'); header_remove('Cache-Control'); @@ -307,6 +306,8 @@ class Photo extends \Zotlabs\Web\Controller { // This has performance considerations but we highly recommend you // leave it alone. + + $maxage = $cache_mode['age']; if($cache_mode['exp'] || (! isset($expires)) || (isset($expires) && $expires - 60 < time())) |