harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zot_refresh: always try the hubloc pointed to by xchan_addr first

Browse Source
This commit is contained in:
redmatrix 2015-09-10 16:48:08 -07:00
parent e6690c818d
commit 50e32c3d8a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/zot.php
View File

@ -296,9 +296,18 @@ function zot_refresh($them, $channel = null, $force = false) {
if ($them['hubloc_url']) { if ($them['hubloc_url']) {
$url = $them['hubloc_url']; $url = $them['hubloc_url'];
} else { } else {
$r = q("select hubloc_url, hubloc_flags from hubloc where hubloc_hash = '%s'", $r = null;
dbesc($them['xchan_hash'])
); if(array_key_exists('xchan_addr',$them) && $them['xchan_addr']) {
$r = q("select hubloc_url, hubloc_flags from hubloc where hubloc_addr = '%s'",
dbesc($them['xchan_addr'])
);
}
if(! $r) {
$r = q("select hubloc_url, hubloc_flags from hubloc where hubloc_hash = '%s'",
dbesc($them['xchan_hash'])
);
}
if ($r) { if ($r) {
foreach ($r as $rr) { foreach ($r as $rr) {
if ($rr['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) { if ($rr['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) {

2
version.inc
View File

@ -1 +1 @@
2015-09-08.1149 2015-09-10.1151