diff options
| author | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
| commit | 2c8a243ece79af05e30b1926bd372698d30f7aab (patch) | |
| tree | 9cc868f56a5456c59eb6e230803f2966c2ce9735 /Zotlabs/Module/Owa.php | |
| parent | 3372fb0761353f646ae2b7bd168650eea5fd6211 (diff) | |
| parent | af7a31cd1400a6b2f21e7c0a622ab448179f0ef8 (diff) | |
| download | volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.gz volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.bz2 volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Daemon/Expire.php
Diffstat (limited to 'Zotlabs/Module/Owa.php')
| -rw-r--r-- | Zotlabs/Module/Owa.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 89f83bf8f..4c6fd6216 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -33,11 +33,11 @@ class Owa extends \Zotlabs\Web\Controller { if($keyId) { - // Hubzilla connections can have both zot and zot6 hublocs - // The connections will usually be zot so match those first + // Hubzilla connections can have both zot6 and zot hublocs + // The connections will usually be zot6 so match those first $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and hubloc_network = 'zot' ", + where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and hubloc_network = 'zot6' ", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); |