aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/Connect.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-05-17 13:28:23 +0000
committerMario <mario@mariovavti.com>2023-05-17 13:28:23 +0000
commit65d98af24c3c7b784f7e2c95998df65901011ce3 (patch)
treed7d6a60698d7a0c3704ea55cb71c543285186b17 /Zotlabs/Lib/Connect.php
parenta57739c462a7991bf2130e8eca0c383eb276f0cd (diff)
parent62d35627f35537d0056482047e74a27ad837c3cf (diff)
downloadvolse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.tar.gz
volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.tar.bz2
volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.zip
Merge branch '8.4RC'8.4
Diffstat (limited to 'Zotlabs/Lib/Connect.php')
-rw-r--r--Zotlabs/Lib/Connect.php3
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)