diff options
| author | Mario <mario@mariovavti.com> | 2020-12-17 12:27:49 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-12-17 12:27:49 +0000 |
| commit | 4c054d6de9a6deec90f70f0c6ac67c9ec0e8f909 (patch) | |
| tree | 6c6d732652cdf013d175b0107447a5ad8ae2c027 /Zotlabs/Module/Owa.php | |
| parent | b2e80efe3f42c6329be7356580d62ea3525717b8 (diff) | |
| parent | 34a58369f2c16a1c13b0ee2a6ab7418e72809d64 (diff) | |
| download | volse-hubzilla-4c054d6de9a6deec90f70f0c6ac67c9ec0e8f909.tar.gz volse-hubzilla-4c054d6de9a6deec90f70f0c6ac67c9ec0e8f909.tar.bz2 volse-hubzilla-4c054d6de9a6deec90f70f0c6ac67c9ec0e8f909.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Owa.php')
| -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 0ed73c8c2..a974f2c1a 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -32,7 +32,7 @@ class Owa extends Controller { $keyId = $sigblock['keyId']; if ($keyId) { $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_deleted = 0", + WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_network IN ('zot6', 'zot')", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); @@ -40,7 +40,7 @@ class Owa extends Controller { $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_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_deleted = 0", + WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_network IN ('zot6', 'zot')", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); |