diff options
| author | Michael <icarus@dabo.de> | 2012-05-26 11:59:19 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-26 11:59:19 +0200 |
| commit | 7b3c02057db47a627b56bdd79f1055ea7f876617 (patch) | |
| tree | 8c9b11fa72e544aea721f385b40bff7254e42ed2 /mod/search.php | |
| parent | 6342b3e0bdd5774857a8fca809994f05e0208d25 (diff) | |
| parent | f5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff) | |
| download | volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.gz volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.bz2 volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/search.php')
| -rw-r--r-- | mod/search.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/search.php b/mod/search.php index 635c87b70..3e6bf68aa 100644 --- a/mod/search.php +++ b/mod/search.php @@ -80,7 +80,7 @@ function search_content(&$a) { $o = '<div id="live-search"></div>' . "\r\n"; - $o .= '<h3>' . t('Search This Site') . '</h3>'; + $o .= '<h3>' . t('Search') . '</h3>'; if(x($a->data,'search')) $search = notags(trim($a->data['search'])); @@ -101,6 +101,10 @@ function search_content(&$a) { $tag = true; $search = substr($search,1); } + if(strpos($search,'@') === 0) { + require_once('mod/dirfind.php'); + return dirfind_content($a); + } if(! $search) return $o; |