sforkowany z mirror/friendica
Rename BaseSearchModule::performSearch to performContactSearch to remove purpose confusion
rodzic
2056e6a5c4
commit
ec7eb9d83a
|
@ -22,7 +22,7 @@ use Friendica\Util\Strings;
|
|||
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 $prefix A optional prefix (e.g. @ or !) for searching
|
||||
|
@ -31,7 +31,7 @@ class BaseSearchModule extends BaseModule
|
|||
* @throws HTTPException\InternalServerErrorException
|
||||
* @throws \ImagickException
|
||||
*/
|
||||
public static function performSearch($search, $prefix = '')
|
||||
public static function performContactSearch($search, $prefix = '')
|
||||
{
|
||||
$a = self::getApp();
|
||||
$config = $a->getConfig();
|
||||
|
|
|
@ -31,6 +31,6 @@ class Directory extends BaseSearchModule
|
|||
$a->page['aside'] .= Widget::findPeople();
|
||||
$a->page['aside'] .= Widget::follow();
|
||||
|
||||
return self::performSearch($search);
|
||||
return self::performContactSearch($search);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -88,7 +88,7 @@ class Index extends BaseSearchModule
|
|||
}
|
||||
|
||||
if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
|
||||
return self::performSearch($search);
|
||||
return self::performContactSearch($search);
|
||||
}
|
||||
|
||||
if (parse_url($search, PHP_URL_SCHEME) != '') {
|
||||
|
@ -109,9 +109,9 @@ class Index extends BaseSearchModule
|
|||
$tag = true;
|
||||
break;
|
||||
case 'contacts':
|
||||
return self::performSearch($search, '@');
|
||||
return self::performContactSearch($search, '@');
|
||||
case 'forums':
|
||||
return self::performSearch($search, '!');
|
||||
return self::performContactSearch($search, '!');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue