diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-03-27 15:20:43 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-03-27 15:20:43 +0100 |
| commit | b10b8ca3f46fca78ee69d89c49fa671096f72caa (patch) | |
| tree | 8e29b3465670dbb2e240b705c6f05924eeaf0e2e /include | |
| parent | c218970890c9d522db67dd7f10d700c04c35a61d (diff) | |
| download | volse-hubzilla-b10b8ca3f46fca78ee69d89c49fa671096f72caa.tar.gz volse-hubzilla-b10b8ca3f46fca78ee69d89c49fa671096f72caa.tar.bz2 volse-hubzilla-b10b8ca3f46fca78ee69d89c49fa671096f72caa.zip | |
fix various issues in z6_discover()
Diffstat (limited to 'include')
| -rw-r--r-- | include/hubloc.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/hubloc.php b/include/hubloc.php index 3fed46495..eb91e4f90 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -311,7 +311,9 @@ function z6_discover() { // find unregistered zot6 clone hublocs - $c = q("select channel_hash, channel_portable_id from channel where channel_deleted = 0"); + $c = q("select channel_hash, channel_portable_id from channel where channel_deleted = '%s'", + dbesc(NULL_DATE) + ); 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'", @@ -332,9 +334,9 @@ function z6_discover() { continue; } // zot6 hubloc not found. - if(strpos($entry['site_project'],'hubzilla') !== false && version_compare($entry['site_version'],'4.0') >= 0) { + if(strpos($q['site_project'],'hubzilla') !== false && version_compare($q['site_version'],'4.0') >= 0) { // probe and store results - only for zot6 (over-ride the zot default) - discover_by_webbie($entry['hubloc_addr'],'zot6'); + discover_by_webbie($q['hubloc_addr'],'zot6'); } } } |