Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-05 23:04:09 +02: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/Worker/Notifier.php
View file

@ -318,7 +318,7 @@ class Notifier
// If this is a public message and pubmail is set on the parent, include all your email contacts
if (
function_exists('imap_open')
&& !Config::get('system','imap_disabled')
&& !DI::config()->get('system','imap_disabled')
&& $public_message
&& intval($target_item['pubmail'])
) {
@ -551,7 +551,7 @@ class Notifier
$url_recipients = array_filter($url_recipients);
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// They are especially used for notifications to OStatus users that don't follow us.
if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
if (!DI::config()->get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
$slap = OStatus::salmon($target_item, $owner);
foreach ($url_recipients as $url) {
Logger::log('Salmon delivery of item ' . $target_id . ' to ' . $url);
@ -640,7 +640,7 @@ class Notifier
}
// Skip DFRN when the item will be (forcefully) delivered via AP
if (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
if (DI::config()->get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
return true;
}