diff options
| author | Mario <mario@mariovavti.com> | 2024-12-25 20:53:32 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-12-25 20:53:32 +0000 |
| commit | 45a78dcbc01d0a5b6a3143ef92e3a2f334c283af (patch) | |
| tree | 4076a05ee7c43826eb0f52d52cdd228bbafdc730 | |
| parent | c9ebb23b695fa717c72b0d8d4c98f4e26259765a (diff) | |
| download | volse-hubzilla-45a78dcbc01d0a5b6a3143ef92e3a2f334c283af.tar.gz volse-hubzilla-45a78dcbc01d0a5b6a3143ef92e3a2f334c283af.tar.bz2 volse-hubzilla-45a78dcbc01d0a5b6a3143ef92e3a2f334c283af.zip | |
this should fix the infinite loop caused by a regression in Daemon/Expire
| -rw-r--r-- | Zotlabs/Daemon/Cron_daily.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Expire.php | 4 | ||||
| -rw-r--r-- | include/items.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php index debc5571e..3bc267f08 100644 --- a/Zotlabs/Daemon/Cron_daily.php +++ b/Zotlabs/Daemon/Cron_daily.php @@ -95,7 +95,7 @@ class Cron_daily { // expire any expired accounts downgrade_accounts(); - // Master::Summon(array('Expire')); + Master::Summon(array('Expire')); Master::Summon(array('Cli_suggest')); remove_obsolete_hublocs(); diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php index 3ac3dee3a..dae585578 100644 --- a/Zotlabs/Daemon/Expire.php +++ b/Zotlabs/Daemon/Expire.php @@ -23,13 +23,13 @@ class Expire { // perform final cleanup on previously delete items - $r = q("select id from item where item_deleted = 1 and item_pending_remove = 0 and changed < %s - INTERVAL %s", + $r = q("select id, uid from item where item_deleted = 1 and item_pending_remove = 0 and changed < %s - INTERVAL %s", db_utcnow(), db_quoteinterval('10 DAY') ); if ($r) { foreach ($r as $rr) { - drop_item($rr['id'], DROPITEM_PHASE2); + drop_item($rr['id'], DROPITEM_PHASE2, uid: $rr['uid']); } } diff --git a/include/items.php b/include/items.php index 84e1e9aee..00c04700e 100644 --- a/include/items.php +++ b/include/items.php @@ -3861,7 +3861,7 @@ function item_expire($uid,$days,$comment_days = 7) { if ($r) { foreach ($r as $item) { - drop_item($item['id'], expire: true); + drop_item($item['id'], uid: $uid); } } |