Merge pull request #8044 from annando/contact-adding

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

diff --git a/src/Core/Search.php b/src/Core/Search.php
index e43e621d2939c594b263a477613fccb08118b0b5..ab06a51a7d7d9c522d2a492257e8e4b60984ca02 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -2,8 +2,8 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Network\HTTPException;
@@ -20,7 +20,7 @@ use Friendica\Util\Strings;
  * - Search in the local directory
  * - Search in the global directory
  */
-class Search extends BaseObject
+class Search
 {
        const DEFAULT_DIRECTORY = 'https://dir.friendica.social';
 
@@ -92,8 +92,7 @@ class Search extends BaseObject
         */
        public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1)
        {
-               $config = self::getApp()->getConfig();
-               $server = $config->get('system', 'directory', self::DEFAULT_DIRECTORY);
+               $server = DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
 
                $searchUrl = $server . '/search';
 
@@ -158,7 +157,7 @@ class Search extends BaseObject
         */
        public static function getContactsFromLocalDirectory($search, $type = self::TYPE_ALL, $start = 0, $itemPage = 80)
        {
-               $config = self::getApp()->getConfig();
+               $config = DI::config();
 
                $diaspora = $config->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::DFRN;
                $ostatus  = !$config->get('system', 'ostatus_disabled') ? Protocol::OSTATUS : Protocol::DFRN;