mirror of
https://github.com/friendica/friendica
synced 2024-11-18 11:43:41 +00:00
Merge pull request #12254 from MrPetovan/bug/reorder-search
Reorder search to try redirecting to post first
This commit is contained in:
commit
7c7cb8373c
1 changed files with 18 additions and 18 deletions
|
@ -120,27 +120,27 @@ class Index extends BaseSearch
|
|||
if (strpos($search, '#') === 0) {
|
||||
$tag = true;
|
||||
$search = substr($search, 1);
|
||||
}
|
||||
} else {
|
||||
if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
|
||||
return self::performContactSearch($search);
|
||||
}
|
||||
|
||||
self::tryRedirectToProfile($search);
|
||||
self::tryRedirectToPost($search);
|
||||
|
||||
if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
|
||||
return self::performContactSearch($search);
|
||||
}
|
||||
self::tryRedirectToProfile($search);
|
||||
|
||||
self::tryRedirectToPost($search);
|
||||
|
||||
if (!empty($_GET['search-option'])) {
|
||||
switch ($_GET['search-option']) {
|
||||
case 'fulltext':
|
||||
break;
|
||||
case 'tags':
|
||||
$tag = true;
|
||||
break;
|
||||
case 'contacts':
|
||||
return self::performContactSearch($search, '@');
|
||||
case 'forums':
|
||||
return self::performContactSearch($search, '!');
|
||||
if (!empty($_GET['search-option'])) {
|
||||
switch ($_GET['search-option']) {
|
||||
case 'fulltext':
|
||||
break;
|
||||
case 'tags':
|
||||
$tag = true;
|
||||
break;
|
||||
case 'contacts':
|
||||
return self::performContactSearch($search, '@');
|
||||
case 'forums':
|
||||
return self::performContactSearch($search, '!');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue