mirror of
https://github.com/friendica/friendica
synced 2025-04-25 11:10:11 +00:00
Fix: Contacts can now be searched with a leading @ again.
This commit is contained in:
parent
725f99c813
commit
f45dbf8b01
2 changed files with 38 additions and 40 deletions
|
@ -91,14 +91,16 @@ class BaseSearch extends BaseModule
|
|||
|
||||
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
|
||||
|
||||
if ($localSearch && empty($results)) {
|
||||
$pager->setItemsPerPage(80);
|
||||
$results = Search::getContactsFromLocalDirectory($search, $type, $pager->getStart(), $pager->getItemsPerPage());
|
||||
} elseif (Search::getGlobalDirectory() && empty($results)) {
|
||||
$results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage());
|
||||
$pager->setItemsPerPage($results->getItemsPage());
|
||||
} else {
|
||||
$results = new ResultList();
|
||||
if (empty($results)) {
|
||||
if ($localSearch) {
|
||||
$pager->setItemsPerPage(80);
|
||||
$results = Search::getContactsFromLocalDirectory($search, $type, $pager->getStart(), $pager->getItemsPerPage());
|
||||
} elseif (Search::getGlobalDirectory()) {
|
||||
$results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage());
|
||||
$pager->setItemsPerPage($results->getItemsPage());
|
||||
} else {
|
||||
$results = new ResultList();
|
||||
}
|
||||
}
|
||||
|
||||
return self::printResult($results, $pager, $header);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue