clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove get_server() in favor of Search::getGlobalDirectory()

Browse Source
This commit is contained in:
nupplaPhil
2020-01-04 23:59:20 +01:00
parent 5d20cd7e16
commit 48baa0be4b
10 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/Search.php
View File

@@ -272,7 +272,7 @@ class Search
$return = GContact::searchByName($search, $mode);
} else {
$p = $page > 1 ? 'p=' . $page : '';
$curlResult = Network::curl(get_server() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
$curlResult = Network::curl(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
if ($curlResult->isSuccess()) {
$searchResult = json_decode($curlResult->getBody(), true);
if (!empty($searchResult['profiles'])) {
@@ -283,4 +283,14 @@ class Search
return $return ?? [];
}
/**
* Returns the global directory name, used in this node
*
* @return string
*/
public static function getGlobalDirectory()
{
return Config::get('system', 'directory', self::DEFAULT_DIRECTORY);
}
}