diff options
| author | Max Kostikov <max@kostikov.co> | 2019-11-25 21:50:02 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-11-25 21:03:22 +0000 |
| commit | 63aa3948e5b4a02abdb1531b2dee990d134351fd (patch) | |
| tree | e12c1017f89822afbaf13321ad2736abc0681bce /Zotlabs | |
| parent | 004861fbb726353ff804921332af7cf371db14e3 (diff) | |
| download | volse-hubzilla-63aa3948e5b4a02abdb1531b2dee990d134351fd.tar.gz volse-hubzilla-63aa3948e5b4a02abdb1531b2dee990d134351fd.tar.bz2 volse-hubzilla-63aa3948e5b4a02abdb1531b2dee990d134351fd.zip | |
resolve merge conflict
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Cron_daily.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Lib/Cache.php | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php index dbfcff439..eebdb0229 100644 --- a/Zotlabs/Daemon/Cron_daily.php +++ b/Zotlabs/Daemon/Cron_daily.php @@ -44,6 +44,11 @@ class Cron_daily { db_utcnow(), db_quoteinterval('1 YEAR') ); + // Clean up emdedded content cache + q("DELETE FROM cache WHERE updated < %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY') + ); //update statistics in config require_once('include/statistics_fns.php'); diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php index cea075659..878201a42 100644 --- a/Zotlabs/Lib/Cache.php +++ b/Zotlabs/Lib/Cache.php @@ -11,8 +11,10 @@ class Cache { $hash = hash('whirlpool',$key); - $r = q("SELECT v FROM cache WHERE k = '%s' limit 1", - dbesc($hash) + $r = q("SELECT v FROM cache WHERE k = '%s' AND updated > %s - INTERVAL %s LIMIT 1", + dbesc($hash), + db_utcnow(), + db_quoteinterval(get_config('system','object_cache_days', '30') . ' DAY') ); if ($r) @@ -40,12 +42,5 @@ class Cache { dbesc(datetime_convert())); } } - - - public static function clear() { - q("DELETE FROM cache WHERE updated < '%s'", - dbesc(datetime_convert('UTC','UTC',"now - 30 days"))); - } - } |