diff options
| author | mjfriaza <mjfriaza@noreply.codeberg.org> | 2021-02-18 13:28:05 +0100 |
|---|---|---|
| committer | mjfriaza <mjfriaza@noreply.codeberg.org> | 2021-02-18 13:28:05 +0100 |
| commit | 655ae9d1cdaa940bb7861eb34f4f489a636879b2 (patch) | |
| tree | 0a10c3d602f5da23dca56ac1360c3ee98282e079 /include/connections.php | |
| parent | 76163fc37b76570e158ab32d53a1c0e0cc298bad (diff) | |
| parent | 08c9152abdfa90da09931bdcc6e6c81ea243434c (diff) | |
| download | volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.tar.gz volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.tar.bz2 volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.zip | |
Merge branch 'dev' into dev
Diffstat (limited to 'include/connections.php')
| -rw-r--r-- | include/connections.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/connections.php b/include/connections.php index bd41e112e..87db7faa9 100644 --- a/include/connections.php +++ b/include/connections.php @@ -211,8 +211,8 @@ function mark_orphan_hubsxchans() { if($dirmode == DIRECTORY_MODE_NORMAL) return; - $r = q("update hubloc set hubloc_error = 1 where hubloc_error = 0 - and hubloc_network = 'zot' and hubloc_connected < %s - interval %s", + $r = q("UPDATE hubloc SET hubloc_error = 1 WHERE hubloc_error = 0 + AND hubloc_network IN ('zot6', 'zot') AND hubloc_connected < %s - INTERVAL %s", db_utcnow(), db_quoteinterval('36 day') ); @@ -357,7 +357,7 @@ function contact_remove($channel_id, $abook_id) { call_hooks('connection_remove',$x); - $archive = get_pconfig($channel_id, 'system','archive_removed_contacts'); + $archive = get_pconfig($channel_id, 'system', 'archive_removed_contacts'); if($archive) { q("update abook set abook_archived = 1 where abook_id = %d and abook_channel = %d", intval($abook_id), |