aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-11-06 01:27:06 +0100
committerM. Dent <dentm42@gmail.com>2018-11-06 01:27:06 +0100
commit873fa16517b36cb5737425e41b0a2a9d6189ade4 (patch)
treeead08f7796445325522684bdb64cf68abcc58619
parentd6523c67a64e590de4d5cddc6efeb5b2f8276eec (diff)
parentf7ce374a28c2d5ad1ff8d8c81a544855d2bf5127 (diff)
downloadvolse-hubzilla-873fa16517b36cb5737425e41b0a2a9d6189ade4.tar.gz
volse-hubzilla-873fa16517b36cb5737425e41b0a2a9d6189ade4.tar.bz2
volse-hubzilla-873fa16517b36cb5737425e41b0a2a9d6189ade4.zip
Merge branch 'patch-23' into 'dev'
Use modern get_config() syntax See merge request hubzilla/core!1368
-rw-r--r--Zotlabs/Module/Photo.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 8efc00707..f01909ff5 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -240,10 +240,8 @@ class Photo extends \Zotlabs\Web\Controller {
// This has performance considerations but we highly recommend you
// leave it alone.
- $cache = get_config('system','photo_cache_time');
- if(! $cache)
- $cache = (3600 * 24); // 1 day
-
+ $cache = get_config('system','photo_cache_time', 86400); // 1 day by default
+
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT");
header("Cache-Control: max-age=" . $cache);