bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Move redundant System::baseUrl() to DI::baseUrl() calls

Browse source
This commit is contained in:
Philipp Holzer 2019-12-30 23:00:08 +01:00
commit 3f34229752
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
81 changed files with 418 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Worker/Delivery.php
View file

@ -8,7 +8,6 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model;
@ -292,7 +291,7 @@ class Delivery
// perform local delivery if we are on the same site
if (Strings::compareLink($basepath, System::baseUrl())) {
if (Strings::compareLink($basepath, DI::baseUrl())) {
$condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
$target_self = DBA::selectFirst('contact', ['uid'], $condition);
if (!DBA::isResult($target_self)) {

5
src/Worker/PubSubPublish.php
View file

@ -6,10 +6,9 @@
namespace Friendica\Worker;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\PushSubscriber;
use Friendica\Model\GServer;
use Friendica\Protocol\OStatus;
use Friendica\Util\Network;
@ -47,7 +46,7 @@ class PubSubPublish
$headers = ["Content-type: application/atom+xml",
sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
System::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
DI::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
$subscriber['topic']),
"X-Hub-Signature: sha1=" . $hmac_sig];