keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename BaseSearchModule::performSearch to performContactSearch to remove purpose confusion

Browse source
This commit is contained in:
Hypolite Petovan 2019-12-24 17:15:41 -05:00
parent 2056e6a5c4
commit ec7eb9d83a
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/BaseSearchModule.php
View file

@ -22,7 +22,7 @@ use Friendica\Util\Strings;
class BaseSearchModule extends BaseModule class BaseSearchModule extends BaseModule
{ {
/** /**
* Performs a search with an optional prefix * Performs a contact search with an optional prefix
* *
* @param string $search Search query * @param string $search Search query
* @param string $prefix A optional prefix (e.g. @ or !) for searching * @param string $prefix A optional prefix (e.g. @ or !) for searching
@ -31,7 +31,7 @@ class BaseSearchModule extends BaseModule
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function performSearch($search, $prefix = '') public static function performContactSearch($search, $prefix = '')
{ {
$a = self::getApp(); $a = self::getApp();
$config = $a->getConfig(); $config = $a->getConfig();

2
src/Module/Search/Directory.php
View file

@ -31,6 +31,6 @@ class Directory extends BaseSearchModule
$a->page['aside'] .= Widget::findPeople(); $a->page['aside'] .= Widget::findPeople();
$a->page['aside'] .= Widget::follow(); $a->page['aside'] .= Widget::follow();
return self::performSearch($search); return self::performContactSearch($search);
} }
} }

6
src/Module/Search/Index.php
View file

@ -88,7 +88,7 @@ class Index extends BaseSearchModule
} }
if (strpos($search, '@') === 0 || strpos($search, '!') === 0) { if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
return self::performSearch($search); return self::performContactSearch($search);
} }
if (parse_url($search, PHP_URL_SCHEME) != '') { if (parse_url($search, PHP_URL_SCHEME) != '') {
@ -109,9 +109,9 @@ class Index extends BaseSearchModule
$tag = true; $tag = true;
break; break;
case 'contacts': case 'contacts':
return self::performSearch($search, '@'); return self::performContactSearch($search, '@');
case 'forums': case 'forums':
return self::performSearch($search, '!'); return self::performContactSearch($search, '!');
} }
} }