diff options
| author | Mario <mario@mariovavti.com> | 2021-09-08 07:43:40 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-09-08 07:43:40 +0000 |
| commit | 4c5f0a05c75cc66113f589a3ffe6df351abb1273 (patch) | |
| tree | 15148d08a99f8375992e554a90e6d4333286a7cc /Zotlabs/Daemon | |
| parent | 952407363e245d41986cfb90e4ccf509bddc7322 (diff) | |
| parent | 977a55eb8423745e4d88257b704d3e36f7337b9f (diff) | |
| download | volse-hubzilla-6.2.tar.gz volse-hubzilla-6.2.tar.bz2 volse-hubzilla-6.2.zip | |
Merge branch '6.2RC'6.2
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 29a8902b0..c0a190c8e 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -48,13 +48,6 @@ class Cron { db_quoteinterval('3 MINUTE') ); - // expire any expired mail - - q("delete from mail where expires > '%s' and expires < %s ", - dbesc(NULL_DATE), - db_utcnow() - ); - require_once('include/account.php'); remove_expired_registrations(); diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 4aebf64b0..5374f49d5 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -126,7 +126,10 @@ class Onepoll { $max = intval(get_config('system', 'max_imported_posts', 30)); if (intval($max)) { - $cl = get_xconfig($contact['abook_xchan'], 'activitypub', 'collections'); + $cl = Activity::get_actor_collections($contact['abook_xchan']); + if(empty($cl)) { + $cl = get_xconfig($contact['abook_xchan'], 'activitypub', 'collections'); + } if (is_array($cl) && array_key_exists('outbox', $cl)) { $url = $cl['outbox']; |