Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 19:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move Config::get() to DI::config()->get()

Browse source
This commit is contained in:
nupplaPhil 2020-01-19 21:21:13 +01:00
parent 5d294e8be8
commit 6c36fd9e01
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
126 changed files with 581 additions and 596 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Protocol/ActivityPub/Processor.php
View file

@ -897,7 +897,7 @@ class Processor
*/
private static function getImplicitMentionList(array $parent)
{
if (Config::get('system', 'disable_implicit_mentions')) {
if (DI::config()->get('system', 'disable_implicit_mentions')) {
return [];
}
@ -939,7 +939,7 @@ class Processor
*/
private static function removeImplicitMentionsFromBody($body, array $potential_mentions)
{
if (Config::get('system', 'disable_implicit_mentions')) {
if (DI::config()->get('system', 'disable_implicit_mentions')) {
return $body;
}
@ -962,7 +962,7 @@ class Processor
private static function convertImplicitMentionsInTags($activity_tags, array $potential_mentions)
{
if (Config::get('system', 'disable_implicit_mentions')) {
if (DI::config()->get('system', 'disable_implicit_mentions')) {
return $activity_tags;
}

12
src/Protocol/ActivityPub/Transmitter.php
View file

@ -363,11 +363,11 @@ class Transmitter
}
}
if (Config::get('system', 'ap_always_bcc')) {
if (DI::config()->get('system', 'ap_always_bcc')) {
$always_bcc = true;
}
if (self::isAnnounce($item) || Config::get('debug', 'total_ap_delivery')) {
if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
@ -548,7 +548,7 @@ class Transmitter
{
$inboxes = [];
if (Config::get('debug', 'total_ap_delivery')) {
if (DI::config()->get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
@ -1364,7 +1364,7 @@ class Transmitter
}
// And finally just use the system language
return Config::get('system', 'language');
return DI::config()->get('system', 'language');
}
/**
@ -1689,7 +1689,7 @@ class Transmitter
if (empty($uid)) {
// Fetch the list of administrators
$admin_mail = explode(',', str_replace(' ', '', Config::get('config', 'admin_email')));
$admin_mail = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
// We need to use some user as a sender. It doesn't care who it will send. We will use an administrator account.
$condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false, 'email' => $admin_mail];
@ -1837,7 +1837,7 @@ class Transmitter
private static function prependMentions($body, array $permission_block)
{
if (Config::get('system', 'disable_implicit_mentions')) {
if (DI::config()->get('system', 'disable_implicit_mentions')) {
return $body;
}