aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-02-17 10:18:30 +0000
committerMario <mario@mariovavti.com>2023-02-17 10:18:30 +0000
commite045a36559dfa6d686f0ef6086a585683c6956ad (patch)
tree96bcc7cec8a62afb9727d12a2b10c64ed81ae5e9
parentee8fc701a61996bc5d93bbac942c0804e2c35950 (diff)
parent777fdeb462122b258c3f56d594ef419d61193e88 (diff)
downloadvolse-hubzilla-e045a36559dfa6d686f0ef6086a585683c6956ad.tar.gz
volse-hubzilla-e045a36559dfa6d686f0ef6086a585683c6956ad.tar.bz2
volse-hubzilla-e045a36559dfa6d686f0ef6086a585683c6956ad.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--Zotlabs/Module/Dirsearch.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php
index 34678af57..c0df8a1e3 100644
--- a/Zotlabs/Module/Dirsearch.php
+++ b/Zotlabs/Module/Dirsearch.php
@@ -263,7 +263,7 @@ class Dirsearch extends Controller {
xprof.xprof_homepage as homepage,
xprof.xprof_hometown as hometown,
xprof.xprof_keywords as keywords
- from xchan left join xprof on xchan_hash = xprof_hash left join hubloc on hubloc_hash = xchan_hash
+ from xchan left join xprof on xchan_hash = xprof_hash left join hubloc on (hubloc_id_url = xchan_url and hubloc_hash = xchan_hash)
where hubloc_primary = 1 and hubloc_updated > %s - INTERVAL %s and ( $logic $sql_extra ) $hub_query and xchan_network = 'zot6' and xchan_system = 0 and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0
$safesql $order $qlimit",
db_utcnow(),