diff options
| author | Mario <mario@mariovavti.com> | 2022-11-05 09:50:55 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-11-05 09:50:55 +0000 |
| commit | 7fc9c83986d0ca0707c408b77f2acfb954532c42 (patch) | |
| tree | f65e899b792ef86f99539b06232e5baf2fe80714 /Zotlabs/Lib/Connect.php | |
| parent | 81b02d04b5c486ed5b23467b25e1441ed6d37da9 (diff) | |
| parent | 5502f1cc63d87bed8198d360ae0e8e7c5fa58f44 (diff) | |
| download | volse-hubzilla-7fc9c83986d0ca0707c408b77f2acfb954532c42.tar.gz volse-hubzilla-7fc9c83986d0ca0707c408b77f2acfb954532c42.tar.bz2 volse-hubzilla-7fc9c83986d0ca0707c408b77f2acfb954532c42.zip | |
Merge branch 'dev'
Diffstat (limited to 'Zotlabs/Lib/Connect.php')
| -rw-r--r-- | Zotlabs/Lib/Connect.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index 6f10bbbae..4570627fc 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -69,7 +69,7 @@ class Connect { $xchan_hash = ''; $sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : ''); - $r = q("select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s') $sql_options ", + $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", dbesc($url), dbesc($url), dbesc($url) @@ -80,7 +80,7 @@ class Connect { // reset results to the best record or the first if we don't have the best // note: this is a single record and not an array of results - $r = Libzot::zot_record_preferred($r,'xchan_network'); + $r = Libzot::zot_record_preferred($r, 'xchan_network'); } @@ -120,7 +120,7 @@ class Connect { // convert to a single record (once again preferring a zot solution in the case of multiples) if ($r) { - $r = Libzot::zot_record_preferred($r,'xchan_network'); + $r = Libzot::zot_record_preferred($r, 'xchan_network'); } } |