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

Refactor dynamic App::getConfig() to static DI::config()

Browse Source
This commit is contained in:
nupplaPhil
2019-12-15 23:44:33 +01:00
parent 2bb9e46be3
commit fceb4f3823
21 changed files with 38 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Search.php
View File

@@ -92,8 +92,7 @@ class Search
*/
public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1)
{
$config = DI::app()->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
*/
public static function getContactsFromLocalDirectory($search, $type = self::TYPE_ALL, $start = 0, $itemPage = 80)
{
$config = DI::app()->getConfig();
$config = DI::config();
$diaspora = $config->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::DFRN;
$ostatus = !$config->get('system', 'ostatus_disabled') ? Protocol::OSTATUS : Protocol::DFRN;

2
src/Core/Worker.php
View File

@@ -1086,7 +1086,7 @@ class Worker
$args = ['no_cron' => !$do_cron];
$a = get_app();
$process = new Core\Process($a->getLogger(), $a->getMode(), $a->getConfig(), $a->getBasePath());
$process = new Core\Process($a->getLogger(), $a->getMode(), DI::config(), $a->getBasePath());
$process->run($command, $args);
// after spawning we have to remove the flag.