diff options
| author | Mario <mario@mariovavti.com> | 2022-04-01 09:50:12 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-04-01 11:56:07 +0200 |
| commit | e7768ae9542e2274fe7fba61d315c32121589338 (patch) | |
| tree | 84e635b8522bd815b92c8ca7d941971fb6fe5d1a /Zotlabs/Lib/Activity.php | |
| parent | 0784cd593a39a4fc297e8a82f7e79bc8019a0868 (diff) | |
| download | volse-hubzilla-e7768ae9542e2274fe7fba61d315c32121589338.tar.gz volse-hubzilla-e7768ae9542e2274fe7fba61d315c32121589338.tar.bz2 volse-hubzilla-e7768ae9542e2274fe7fba61d315c32121589338.zip | |
fixes in regard to hub re-installs: dismiss deleted hublocs, make sure we use the latest hubloc entry for addressing, in Queue::deliver() prefer primaries since their info is probably more accurate
(cherry picked from commit 38d977e54612e0cfbe69aae47c656f1cada037c6)
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 0c25605e7..7663131bb 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -567,7 +567,7 @@ class Activity { } } } - $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d limit 1", + $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1", intval($i['parent']) ); if ($d) { @@ -980,7 +980,7 @@ class Activity { } } - $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d limit 1", + $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1", intval($i['parent']) ); if ($d) { |