aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/directory.php4
-rw-r--r--mod/search.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/mod/directory.php b/mod/directory.php
index 274584862..87dadc58f 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -51,6 +51,10 @@ function directory_content(&$a) {
$observer = get_observer_hash();
$globaldir = get_globaldir_setting($observer);
+ // override your personal global search pref if we're doing a navbar search of the directory
+ if(intval($_REQUEST['navsearch']))
+ $globaldir = 1;
+
$safe_mode = get_safemode_setting($observer);
$pubforums = null;
diff --git a/mod/search.php b/mod/search.php
index 4d66086f8..e235f720a 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -57,12 +57,12 @@ function search_content(&$a,$update = 0, $load = false) {
}
if(strpos($search,'@') === 0) {
$search = substr($search,1);
- goaway(z_root() . '/directory' . '?f=1&search=' . $search);
+ goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
}
// look for a naked webbie
if(strpos($search,'@') !== false) {
- goaway(z_root() . '/directory' . '?f=1&search=' . $search);
+ goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
}
if(! $search)