diff options
| author | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
| commit | 65d98af24c3c7b784f7e2c95998df65901011ce3 (patch) | |
| tree | d7d6a60698d7a0c3704ea55cb71c543285186b17 /Zotlabs/Daemon/Expire.php | |
| parent | a57739c462a7991bf2130e8eca0c383eb276f0cd (diff) | |
| parent | 62d35627f35537d0056482047e74a27ad837c3cf (diff) | |
| download | volse-hubzilla-8.4.tar.gz volse-hubzilla-8.4.tar.bz2 volse-hubzilla-8.4.zip | |
Merge branch '8.4RC'8.4
Diffstat (limited to 'Zotlabs/Daemon/Expire.php')
| -rw-r--r-- | Zotlabs/Daemon/Expire.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php index 5d9f14b28..84a606dc2 100644 --- a/Zotlabs/Daemon/Expire.php +++ b/Zotlabs/Daemon/Expire.php @@ -32,7 +32,6 @@ class Expire { } // physically remove anything that has been deleted for more than two months - /** @FIXME - this is a wretchedly inefficient query */ q("delete from item where item_pending_remove = 1 and changed < %s - INTERVAL %s", db_utcnow(), @@ -59,8 +58,8 @@ class Expire { continue; // service class default (if non-zero) over-rides the site default - $service_class_expire = service_class_fetch($rr['channel_id'], 'expire_days'); + if (intval($service_class_expire)) $channel_expire = $service_class_expire; else @@ -85,7 +84,6 @@ class Expire { // this should probably just fetch the channel_expire_days from the sys channel, // but there's no convenient way to set it. - $expire_days = get_config('system', 'sys_expire_days'); if ($expire_days === false) $expire_days = 30; @@ -96,8 +94,9 @@ class Expire { logger('Expire: sys interval: ' . $expire_days, LOGGER_DEBUG); - if ($expire_days) + if ($expire_days) { item_expire($x['channel_id'], $expire_days, $commented_days); + } logger('Expire: sys: done', LOGGER_DEBUG); } |