Convert potential spaces in Memcache(d) key names

[friendica.git] / src / Core / Search.php

diff --git a/src/Core/Search.php b/src/Core/Search.php
index edaf03e2d266a7ff1d6527af9cd2194086105580..41c75ad32b2b463c47af5d3c89bd5f69c7c9ecbf 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -25,7 +25,6 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
@@ -105,7 +104,7 @@ class Search
         */
        public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1)
        {
-               $server = DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
+               $server = self::getGlobalDirectory();
 
                $searchUrl = $server . '/search';
 
@@ -123,7 +122,7 @@ class Search
                        $searchUrl .= '&page=' . $page;
                }
 
-               $resultJson = DI::httpClient()->fetch($searchUrl, 0, HttpClientAccept::JSON);
+               $resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON);
 
                $results = json_decode($resultJson, true);
 
@@ -229,7 +228,7 @@ class Search
                        $return = Contact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::JSON]);
+                       $curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), HttpClientAccept::JSON);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {