aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-06 16:14:12 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-06 16:14:12 -0700
commit04959a095f46272ecfee225e1dd85796f4e0676f (patch)
tree94e691a148d58f2b6f4519e510f6dec79d9a3823
parentf1e73abd21ac99b00038242b8a4e882e7f6dfc12 (diff)
downloadvolse-hubzilla-04959a095f46272ecfee225e1dd85796f4e0676f.tar.gz
volse-hubzilla-04959a095f46272ecfee225e1dd85796f4e0676f.tar.bz2
volse-hubzilla-04959a095f46272ecfee225e1dd85796f4e0676f.zip
make the findpeople widget honour the local/global directory setting
-rw-r--r--mod/dirsearch.php2
-rw-r--r--version.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 07621aaef..c741d31a3 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -100,7 +100,7 @@ function dirsearch_content(&$a) {
if($name)
$sql_extra .= dir_query_build($joiner,'xchan_name',$name);
if($hub)
- $sql_extra .= " $joiner xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') ";
+ $sql_extra .= " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') ";
if($address)
$sql_extra .= dir_query_build($joiner,'xchan_addr',$address);
if($city)
diff --git a/version.inc b/version.inc
index e6ec6b1d0..18bf58d83 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-05.993
+2015-04-06.994