From 7f78540454b97dc2848f06be335bdcd1481be5e4 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 6 Jul 2018 06:45:30 +0000 Subject: [PATCH] Expire does work now for activities as well --- src/Worker/Expire.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php index 342408894e..5d56308faf 100644 --- a/src/Worker/Expire.php +++ b/src/Worker/Expire.php @@ -26,17 +26,18 @@ class Expire { if ($param == 'delete') { logger('Delete expired items', LOGGER_DEBUG); // physically remove anything that has been deleted for more than two months - $r = dba::p("SELECT `id`, `iaid`, `icid` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); - while ($row = dba::fetch($r)) { + $condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"]; + $rows = dba::select('item', ['id', 'iaid', 'icid'], $condition); + while ($row = dba::fetch($rows)) { dba::delete('item', ['id' => $row['id']]); if (!empty($row['iaid']) && !dba::exists('item', ['iaid' => $row['iaid']])) { - dba::delete('item-content', ['id' => $row['icid']]); + dba::delete('item-activity', ['id' => $row['iaid']]); } if (!empty($row['icid']) && !dba::exists('item', ['icid' => $row['icid']])) { dba::delete('item-content', ['id' => $row['icid']]); } } - dba::close($r); + dba::close($rows); logger('Delete expired items - done', LOGGER_DEBUG);