harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #226

Browse Source
This commit is contained in:
friendica 2015-04-05 21:32:54 -07:00
parent 60e94b315c
commit f1e73abd21
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/directory.php
View File

@ -51,6 +51,10 @@ function directory_content(&$a) {
$observer = get_observer_hash(); $observer = get_observer_hash();
$globaldir = get_globaldir_setting($observer); $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); $safe_mode = get_safemode_setting($observer);
$pubforums = null; $pubforums = null;

4
mod/search.php
View File

@ -57,12 +57,12 @@ function search_content(&$a,$update = 0, $load = false) {
} }
if(strpos($search,'@') === 0) { if(strpos($search,'@') === 0) {
$search = substr($search,1); $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 // look for a naked webbie
if(strpos($search,'@') !== false) { if(strpos($search,'@') !== false) {
goaway(z_root() . '/directory' . '?f=1&search=' . $search); goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
} }
if(! $search) if(! $search)

2
version.inc
View File

@ -1 +1 @@
2015-04-03.991 2015-04-05.993