diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-11-05 09:56:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-11-05 09:56:52 +0100 |
| commit | b6938da552890f60409e17c32498a0760bb60f43 (patch) | |
| tree | 13b62c1c69b2e28609041e052ae916b3983094fb /Zotlabs/Module/Owa.php | |
| parent | 92ea3ef72036c39601b69565f3e03fa44ad9aef7 (diff) | |
| parent | 73d2719330789c40d7b64fcc2e6ca2eec0d9deb6 (diff) | |
| download | volse-hubzilla-b6938da552890f60409e17c32498a0760bb60f43.tar.gz volse-hubzilla-b6938da552890f60409e17c32498a0760bb60f43.tar.bz2 volse-hubzilla-b6938da552890f60409e17c32498a0760bb60f43.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Owa.php')
| -rw-r--r-- | Zotlabs/Module/Owa.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 4a488086f..ad57f883c 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -31,15 +31,17 @@ class Owa extends \Zotlabs\Web\Controller { if($keyId) { $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where hubloc_addr = '%s' ", - dbesc(str_replace('acct:','',$keyId)) + where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ", + dbesc(str_replace('acct:','',$keyId)), + 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_addr = '%s' ", - dbesc(str_replace('acct:','',$keyId)) + where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ", + dbesc(str_replace('acct:','',$keyId)), + dbesc($keyId) ); } } |