diff options
| author | Andrew Manning <tamanning@zoho.com> | 2017-01-01 07:41:36 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2017-01-01 07:41:36 -0500 |
| commit | ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa (patch) | |
| tree | 6d8db4c43a7bbe084968c8b377dde336266e7830 /Zotlabs | |
| parent | 2ba23ebb136b222b59bd0d59e9f606b3b5e4572c (diff) | |
| parent | e2eb0b2eac6f32a0e4781eabbb147f0bee0736fb (diff) | |
| download | volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.tar.gz volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.tar.bz2 volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Directory.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 76f1937a2..59ae88857 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; |