diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-05 21:32:54 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-05 21:32:54 -0700 |
| commit | f1e73abd21ac99b00038242b8a4e882e7f6dfc12 (patch) | |
| tree | 86d2c682970e66ad85ae726f1021e0ccf8399933 | |
| parent | 60e94b315cb326b068eaccb7705ecc02f26302f0 (diff) | |
| download | volse-hubzilla-f1e73abd21ac99b00038242b8a4e882e7f6dfc12.tar.gz volse-hubzilla-f1e73abd21ac99b00038242b8a4e882e7f6dfc12.tar.bz2 volse-hubzilla-f1e73abd21ac99b00038242b8a4e882e7f6dfc12.zip | |
issue #226
| -rw-r--r-- | mod/directory.php | 4 | ||||
| -rw-r--r-- | mod/search.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 7 insertions, 3 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) diff --git a/version.inc b/version.inc index e8ca25062..e6ec6b1d0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-04-03.991 +2015-04-05.993 |