diff options
| author | Mario <mario@mariovavti.com> | 2021-08-30 11:08:40 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-08-30 11:08:40 +0000 |
| commit | ada7d4eef5a6dd26a06fef1abd668332f6d0226a (patch) | |
| tree | 8571c41758e140ebb52e4492d5f5aec2ce35da1d /Zotlabs/Module | |
| parent | 3fb4077672d0ad81be4c435150dc740b64c64727 (diff) | |
| parent | 8343f63964c6cc992c2a8c90aa2a1080d5804323 (diff) | |
| download | volse-hubzilla-ada7d4eef5a6dd26a06fef1abd668332f6d0226a.tar.gz volse-hubzilla-ada7d4eef5a6dd26a06fef1abd668332f6d0226a.tar.bz2 volse-hubzilla-ada7d4eef5a6dd26a06fef1abd668332f6d0226a.zip | |
Merge branch 'owafix' into 'dev'
OWA: very difficult to trace failures due to empty public key record. The...
See merge request hubzilla/core!1986
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Owa.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 9a3513f34..e30aa5fb4 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -32,14 +32,14 @@ class Owa extends Controller { $keyId = $sigblock['keyId']; if ($keyId) { $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE hubloc_id_url = '%s'", + WHERE hubloc_id_url = '%s' AND xchan_pubkey != '' ", dbesc($keyId) ); if (! $r) { $found = discover_by_webbie(str_replace('acct:','',$keyId)); if ($found) { $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE hubloc_id_url = '%s'", + WHERE hubloc_id_url = '%s' AND xchan_pubkey != '' ", dbesc($keyId) ); } |