aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-18 17:20:59 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-18 17:20:59 -0700
commit4c319a98a825d58b78d5967d954c7affaddd4f2b (patch)
treeec368417c87e911c7a80c563f4ae56eb7877e740 /mod
parent71a2f2d773526b7158e739e20fcfe3598d822ad4 (diff)
downloadvolse-hubzilla-4c319a98a825d58b78d5967d954c7affaddd4f2b.tar.gz
volse-hubzilla-4c319a98a825d58b78d5967d954c7affaddd4f2b.tar.bz2
volse-hubzilla-4c319a98a825d58b78d5967d954c7affaddd4f2b.zip
fix some merge errors
Diffstat (limited to 'mod')
-rw-r--r--mod/dirsearch.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 0b8cfdc6d..132ed252b 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -245,10 +245,12 @@ function dirsearch_content(&$a) {
json_return_and_die($spkt);
}
else {
- $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $order $qlimit ",
+ $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash
+ where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0
+ $safesql $order $qlimit "
+ );
$ret['page'] = $page + 1;
$ret['records'] = count($r);
- );
}