From 0271f2a1ae5175fc5f1a7ec4f860a5d6372d7aeb Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Mar 2020 08:14:20 +0000 Subject: fix z6_discover() to do the right thing after transition --- include/hubloc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/hubloc.php') diff --git a/include/hubloc.php b/include/hubloc.php index 4a1f77733..059a4dadc 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -317,7 +317,7 @@ function z6_discover() { if ($c) { foreach ($c as $entry) { $q1 = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_deleted = 0 and site_dead = 0 and hubloc_hash = '%s' and hubloc_url != '%s'", - dbesc($entry['channel_hash']), + dbesc($entry['channel_portable_id']), dbesc(z_root()) ); if (! $q1) { @@ -327,7 +327,7 @@ function z6_discover() { // does this particular server have a zot6 clone registered on our site for this channel? foreach ($q1 as $q) { $q2 = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_deleted = 0 and site_dead = 0 and hubloc_hash = '%s' and hubloc_url = '%s'", - dbesc($entry['channel_portable_id']), + dbesc($entry['channel_hash']), dbesc($q['hubloc_url']) ); if ($q2) { -- cgit v1.2.3