aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/Activity.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-04-01 09:50:12 +0000
committerMario <mario@mariovavti.com>2022-04-01 09:50:12 +0000
commit38d977e54612e0cfbe69aae47c656f1cada037c6 (patch)
tree9f05d6f981436a4f1c0590f4068409c065e3a8a4 /Zotlabs/Lib/Activity.php
parent3e38a24f0a28e9ad25dc322441ba45adf3bf2c02 (diff)
downloadvolse-hubzilla-38d977e54612e0cfbe69aae47c656f1cada037c6.tar.gz
volse-hubzilla-38d977e54612e0cfbe69aae47c656f1cada037c6.tar.bz2
volse-hubzilla-38d977e54612e0cfbe69aae47c656f1cada037c6.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
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
-rw-r--r--Zotlabs/Lib/Activity.php4
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) {