aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-03-26 08:14:20 +0000
committerMario <mario@mariovavti.com>2020-03-26 08:14:20 +0000
commit0271f2a1ae5175fc5f1a7ec4f860a5d6372d7aeb (patch)
treebc6b8b312c52d5656f84fa5a9e93443468043d97
parent0c1c386a0af1e8dabaf7acf345dffa5cf5ad89eb (diff)
downloadvolse-hubzilla-0271f2a1ae5175fc5f1a7ec4f860a5d6372d7aeb.tar.gz
volse-hubzilla-0271f2a1ae5175fc5f1a7ec4f860a5d6372d7aeb.tar.bz2
volse-hubzilla-0271f2a1ae5175fc5f1a7ec4f860a5d6372d7aeb.zip
fix z6_discover() to do the right thing after transition
-rw-r--r--include/hubloc.php4
1 files changed, 2 insertions, 2 deletions
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) {