make navbar search use the module search function in /network and /channel

This commit is contained in:
Mario Vavti
2018-05-30 22:40:22 +02:00
parent e1a55ba471
commit 6349a7417f
5 changed files with 41 additions and 15 deletions

View File

@@ -138,6 +138,7 @@ class Network extends \Zotlabs\Web\Controller {
if(x($_GET,'search') || x($_GET,'file'))
$nouveau = true;
if($cid) {
$r = q("SELECT abook_xchan, xchan_addr, xchan_url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
intval($cid),
@@ -567,6 +568,9 @@ class Network extends \Zotlabs\Web\Controller {
}
$mode = (($nouveau) ? 'network-new' : 'network');
if($search)
$mode = 'search';
$o .= conversation($items,$mode,$update,$page_mode);