From 4c319a98a825d58b78d5967d954c7affaddd4f2b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 18 May 2015 17:20:59 -0700 Subject: fix some merge errors --- mod/dirsearch.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mod') 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); - ); } -- cgit v1.2.3