Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 16:30:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move mod/search to src/Module/Search/Index

Browse source 
- Update BaseSeachModule not to depend on a single query string parameter
This commit is contained in:
Hypolite Petovan 2019-10-07 14:27:20 -04:00
parent 22598fc7e8
commit 1e737ae888
5 changed files with 207 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Module/BaseSearchModule.php
View file

@ -23,13 +23,14 @@ class BaseSearchModule extends BaseModule
/**
* Performs a search with an optional prefix
*
* @param string $search Search query
* @param string $prefix A optional prefix (e.g. @ or !) for searching
*
* @return string
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function performSearch($prefix = '')
public static function performSearch($search, $prefix = '')
{
$a = self::getApp();
$config = $a->getConfig();
@ -38,7 +39,7 @@ class BaseSearchModule extends BaseModule
$localSearch = $config->get('system', 'poco_local_search');
$search = $prefix . Strings::escapeTags(trim(defaults($_REQUEST, 'search', '')));
$search = $prefix . $search;
if (!$search) {
return '';
@ -62,7 +63,7 @@ class BaseSearchModule extends BaseModule
$header = L10n::t('Forum Search - %s', $search);
}
$pager = new Pager($a->query_string);
$pager = new Pager(self::getArgs()->getQueryString());
if ($localSearch && empty($results)) {
$pager->setItemsPerPage(80);