diff options
| author | Max Kostikov <max@kostikov.co> | 2019-08-22 20:29:53 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-08-22 20:29:53 +0200 |
| commit | 35790c584ba5a67a94556ab67ddd57c76a500084 (patch) | |
| tree | 381861758472beb7e2692193c40109c3029c7f5c | |
| parent | 09d7cf2cc1d23fc23b084181342192e328234920 (diff) | |
| parent | 8c96032b2bdef07795e6f2ba6e9312e0ebc9320f (diff) | |
| download | volse-hubzilla-35790c584ba5a67a94556ab67ddd57c76a500084.tar.gz volse-hubzilla-35790c584ba5a67a94556ab67ddd57c76a500084.tar.bz2 volse-hubzilla-35790c584ba5a67a94556ab67ddd57c76a500084.zip | |
Merge branch 'dev' into 'dev'
possible for DB to return hublocs with no sitekey
See merge request hubzilla/core!1713
| -rw-r--r-- | Zotlabs/Lib/Queue.php | 2 | ||||
| -rw-r--r-- | include/queue_fn.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php index baa1da70d..49891a55b 100644 --- a/Zotlabs/Lib/Queue.php +++ b/Zotlabs/Lib/Queue.php @@ -250,7 +250,7 @@ class Queue { $host_crypto = null; if($channel && $base) { - $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' order by hubloc_id desc limit 1", + $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_sitekey != '' order by hubloc_id desc limit 1", dbesc($base) ); if($h) { diff --git a/include/queue_fn.php b/include/queue_fn.php index 85f98aaf9..865228041 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -286,7 +286,7 @@ function queue_deliver($outq, $immediate = false) { $host_crypto = null; if($channel && $base) { - $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' order by hubloc_id desc limit 1", + $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_sitekey != '' order by hubloc_id desc limit 1", dbesc($base) ); if($h) { |