From 2e47ef38a9b18a49d6e13256309519deed3683b4 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 22 Mar 2021 10:12:57 +0000 Subject: libsync fix from zap: look for hubloc_updated instead of hubloc_connected which would always be true (cherry picked from commit ccefb99cbee3c8585ede2c6e67289c5d54b38dca) --- Zotlabs/Lib/Libsync.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Lib/Libsync.php') diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index e16b68cf8..7e97e4c70 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -781,7 +781,7 @@ class Libsync { $t = datetime_convert('UTC', 'UTC', 'now - 15 minutes'); if (array_key_exists('site', $arr) && $location['url'] == $arr['site']['url']) { - q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_connected < '%s'", + q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_updated < '%s'", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($r[0]['hubloc_id']), -- cgit v1.2.3 From 6d5f98072df1c2937723d2accd099f95a9d773a4 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 24 Mar 2021 09:21:58 +0000 Subject: php8: fix fatal errors (cherry picked from commit 1a15c775f8b7b5f19ba7ba68730f31a20da402b5) --- Zotlabs/Lib/Libsync.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Zotlabs/Lib/Libsync.php') diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index 7e97e4c70..5455aa2ea 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -716,6 +716,9 @@ class Libsync { dbesc($sender['hash']) ); + if(!$xisting) + $xisting = []; + // See if a primary is specified $has_primary = false; -- cgit v1.2.3