diff options
| author | zotlabs <mike@macgirvin.com> | 2019-11-07 14:48:44 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-11-07 14:48:44 -0800 |
| commit | 839c6668cfdb12934acf70e67e6721981f99a2f0 (patch) | |
| tree | 474060cab80b79667390a11a3d2005bd7feca5e9 /Zotlabs/Module/Photo.php | |
| parent | 1358a81c32ff9dff2e88b196c63f299788b05b57 (diff) | |
| parent | e9a9fc50501d63998203c51e8e0d5ce4a3fcf598 (diff) | |
| download | volse-hubzilla-839c6668cfdb12934acf70e67e6721981f99a2f0.tar.gz volse-hubzilla-839c6668cfdb12934acf70e67e6721981f99a2f0.tar.bz2 volse-hubzilla-839c6668cfdb12934acf70e67e6721981f99a2f0.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.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index fe8c47544..48e2bf4a5 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -221,7 +221,7 @@ class Photo extends \Zotlabs\Web\Controller { header_remove('Pragma'); - if($_SERVER['HTTP_IF_NONE_MATCH'] === $etag || $_SERVER['HTTP_IF_MODIFIED_SINCE'] === gmdate("D, d M Y H:i:s", $modified) . " GMT") { + 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'); header_remove('Set-Cookie'); |