diff options
| author | Max Kostikov <max@kostikov.co> | 2020-03-31 19:54:20 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-03-31 19:54:20 +0200 |
| commit | 5a2c62466e773ce043a1b39bd2f1e7003a53d9f2 (patch) | |
| tree | 363847c74a9068f3c8cf5110a5ac377c5d40fba1 /include/hubloc.php | |
| parent | c2b691fd0153f0b468f9014b4ca1f0f2b339c617 (diff) | |
| parent | b739f91caa1522522a4ce093d7c63f0f4c777085 (diff) | |
| download | volse-hubzilla-5a2c62466e773ce043a1b39bd2f1e7003a53d9f2.tar.gz volse-hubzilla-5a2c62466e773ce043a1b39bd2f1e7003a53d9f2.tar.bz2 volse-hubzilla-5a2c62466e773ce043a1b39bd2f1e7003a53d9f2.zip | |
Merge branch 'dev' into 'dev'
Sync dev
See merge request kostikov/core!2
Diffstat (limited to 'include/hubloc.php')
| -rw-r--r-- | include/hubloc.php | 4 |
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) { |