diff options
| author | Mario <mario@mariovavti.com> | 2023-05-10 08:16:09 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-10 08:16:09 +0000 |
| commit | 4ae81d753c01282bd4275b2afb915123c3c7355f (patch) | |
| tree | 140aa43d79170b60e595f81663fcdb6ac84bce00 | |
| parent | 93dda6f1fd99b2e475854bc12aafc3c5f212fcab (diff) | |
| parent | 0f01aac82340a77fb6f087245ea53cfa655bdcef (diff) | |
| download | volse-hubzilla-4ae81d753c01282bd4275b2afb915123c3c7355f.tar.gz volse-hubzilla-4ae81d753c01282bd4275b2afb915123c3c7355f.tar.bz2 volse-hubzilla-4ae81d753c01282bd4275b2afb915123c3c7355f.zip | |
Merge branch 'dev' into 8.4RC
| -rw-r--r-- | Zotlabs/Lib/Connect.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index 802bbe0f5..4de41526b 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -69,7 +69,8 @@ class Connect { $xchan_hash = ''; $sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : ''); - $r = q("SELECT * FROM xchan LEFT JOIN hubloc ON xchan_hash = hubloc_hash WHERE ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s') $sql_options ORDER BY hubloc_id DESC", + // We need both, the xchan and the hubloc here hence use JOIN instead of LEFT JOIN + $r = q("SELECT * FROM xchan JOIN hubloc ON xchan_hash = hubloc_hash WHERE ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s') $sql_options ORDER BY hubloc_id DESC", dbesc($url), dbesc($url), dbesc($url) |