aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-30 13:09:35 -0800
committerzotlabs <mike@macgirvin.com>2016-12-30 13:31:59 -0800
commitba8a5ac82b184eac27f115df48eda102d5c549cf (patch)
treea22583231ce2984d33ab56d5370d2ceb4ce5a921
parent3dd4bf9955cb70feb508b3b56ad4c025b938c4ad (diff)
downloadvolse-hubzilla-ba8a5ac82b184eac27f115df48eda102d5c549cf.tar.gz
volse-hubzilla-ba8a5ac82b184eac27f115df48eda102d5c549cf.tar.bz2
volse-hubzilla-ba8a5ac82b184eac27f115df48eda102d5c549cf.zip
peoplefind widget should honour directory option settings (such as this site only).
-rw-r--r--Zotlabs/Module/Directory.php1
-rwxr-xr-xview/tpl/peoplefind.tpl1
2 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index da9bb146f..ceeeda933 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -68,6 +68,7 @@ class Directory extends \Zotlabs\Web\Controller {
$observer = get_observer_hash();
$globaldir = get_directory_setting($observer, 'globaldir');
+
// override your personal global search pref if we're doing a navbar search of the directory
if(intval($_REQUEST['navsearch']))
$globaldir = 1;
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 0b7f792a6..ae0b7f1ea 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,7 +1,6 @@
<div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3>
<form action="directory" method="post" />
- <input type="hidden" name="navsearch" value="1" />
<div class="form-group">
<div class="input-group">
<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />