diff options
| author | MicMee <michael@meer.name> | 2013-01-23 04:55:09 -0800 |
|---|---|---|
| committer | MicMee <michael@meer.name> | 2013-01-23 04:55:09 -0800 |
| commit | 9996d5ee9b7196774cb1d95334507c20f1883428 (patch) | |
| tree | 4c10561076f16d9f18b7b5943bc1930814c6d52c /mod/search.php | |
| parent | fca354aa463e84b67fe62e4067905e8f363c0e80 (diff) | |
| parent | 0b18dd15c5377da121f0fb781c0530ca0d328eb9 (diff) | |
| download | volse-hubzilla-9996d5ee9b7196774cb1d95334507c20f1883428.tar.gz volse-hubzilla-9996d5ee9b7196774cb1d95334507c20f1883428.tar.bz2 volse-hubzilla-9996d5ee9b7196774cb1d95334507c20f1883428.zip | |
Merge pull request #1 from friendica/master
get changes
Diffstat (limited to 'mod/search.php')
| -rw-r--r-- | mod/search.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mod/search.php b/mod/search.php index 6f40ad4b0..7a0f4205d 100644 --- a/mod/search.php +++ b/mod/search.php @@ -113,8 +113,13 @@ function search_content(&$a) { $search = substr($search,1); } if(strpos($search,'@') === 0) { - require_once('mod/dirfind.php'); - return dirfind_content($a); + $search = substr($search,1); + goaway(z_root() . '/directory' . '?f=1&search=' . $search); + } + + // look for a naked webbie + if(strpos($search,'@') !== false) { + goaway(z_root() . '/directory' . '?f=1&search=' . $search); } if(! $search) @@ -186,11 +191,10 @@ function search_content(&$a) { if($load) { $r = q("SELECT distinct(uri), item.* from item WHERE item_restrict = 0 - AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND not ( item_flags & %d )) + AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND item_private = 0 ) OR ( `item`.`uid` = %d )) $sql_extra group by uri ORDER BY created DESC $pager_sql ", - intval(ITEM_PRIVATE), intval(local_user()), intval(ABOOK_FLAG_BLOCKED) |