aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Network.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-30 22:40:22 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-30 22:40:22 +0200
commit6349a7417f41cd697ba2dea82653911a1abaaf94 (patch)
tree39ae6dd7de859405c6fd6fd88bc42a2fce0f483b /Zotlabs/Module/Network.php
parente1a55ba471a2de5dd31e51c2471f8c3122ad2919 (diff)
downloadvolse-hubzilla-6349a7417f41cd697ba2dea82653911a1abaaf94.tar.gz
volse-hubzilla-6349a7417f41cd697ba2dea82653911a1abaaf94.tar.bz2
volse-hubzilla-6349a7417f41cd697ba2dea82653911a1abaaf94.zip
make navbar search use the module search function in /network and /channel
Diffstat (limited to 'Zotlabs/Module/Network.php')
-rw-r--r--Zotlabs/Module/Network.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 5e7492fd4..acd12158c 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -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);