diff options
| author | Mario <mario@mariovavti.com> | 2023-05-09 07:50:30 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-09 07:50:30 +0000 |
| commit | 0bf2be1f9d359e3b25370ea491e4cf133a527320 (patch) | |
| tree | 1af444da328e94afab4cc4436b4eb4aabf891fa1 | |
| parent | 697a1b1ed1ebe0d05c0467f396b33bbfbba2a9ca (diff) | |
| parent | 548589be4db615562eea3776fa99c82d77349cf3 (diff) | |
| download | volse-hubzilla-0bf2be1f9d359e3b25370ea491e4cf133a527320.tar.gz volse-hubzilla-0bf2be1f9d359e3b25370ea491e4cf133a527320.tar.bz2 volse-hubzilla-0bf2be1f9d359e3b25370ea491e4cf133a527320.zip | |
Merge branch 'owa-compat-friendica' into 'dev'
Owa compatibility for Friendica
See merge request hubzilla/core!2036
| -rw-r--r-- | Zotlabs/Module/Owa.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 3400defd7..02997d3f1 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -32,7 +32,8 @@ 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' AND hubloc_deleted = 0 AND xchan_pubkey != '' ORDER BY hubloc_id DESC", + WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_deleted = 0 AND xchan_pubkey != '' ORDER BY hubloc_id DESC", + dbesc(str_replace('acct:', '', $keyId)), dbesc($keyId) ); if (! $r) { |