From 158b8aea387098e62e83920a8425549c02f17bdf Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 10 Nov 2019 10:49:44 +0000 Subject: hopefully fix query for postgres (cherry picked from commit 9ad4c6528cc3ee4e34d2b5d77027a1c33cbadf5c) --- Zotlabs/Daemon/Cron.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Zotlabs/Daemon/Cron.php') diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 7b951e7d4..8fa31e6ce 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -97,13 +97,16 @@ class Cron { // Clean expired photos from cache - $sql_interval = "'" . dbesc(datetime_convert()) . "' - INTERVAL " . db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY'); - $r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < $sql_interval", - intval(PHOTO_CACHE) + $r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s", + intval(PHOTO_CACHE), + db_utcnow(), + db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY') ); if($r) { - q("DELETE FROM photo WHERE photo_usage = %d AND expires < $sql_interval", - intval(PHOTO_CACHE) + q("DELETE FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s", + intval(PHOTO_CACHE), + db_utcnow(), + db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY') ); foreach($r as $rr) { $file = dbunescbin($rr['content']); -- cgit v1.2.3