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

This commit is contained in:
nupplaPhil
2019-12-30 23:00:08 +01:00
parent f2da1c5ab9
commit 3f34229752
81 changed files with 418 additions and 465 deletions
+5 -5
View File
@@ -11,8 +11,8 @@ use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
@@ -179,7 +179,7 @@ function ping_init(App $a)
$intro_count = count($intros1) + count($intros2);
$intros = $intros1 + $intros2;
$myurl = System::baseUrl() . '/profile/' . $a->user['nickname'];
$myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
$mails = q(
"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -263,7 +263,7 @@ function ping_init(App $a)
foreach ($intros as $intro) {
$notif = [
'id' => 0,
'href' => System::baseUrl() . '/notifications/intros/' . $intro['id'],
'href' => DI::baseUrl() . '/notifications/intros/' . $intro['id'],
'name' => $intro['name'],
'url' => $intro['url'],
'photo' => $intro['photo'],
@@ -279,7 +279,7 @@ function ping_init(App $a)
foreach ($regs as $reg) {
$notif = [
'id' => 0,
'href' => System::baseUrl() . '/admin/users/',
'href' => DI::baseUrl() . '/admin/users/',
'name' => $reg['name'],
'url' => $reg['url'],
'photo' => $reg['micro'],
@@ -446,7 +446,7 @@ function ping_get_notifications($uid)
);
}
$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
$notification["href"] = DI::baseUrl() . "/notify/view/" . $notification["id"];
if ($notification["visible"]
&& !$notification["deleted"]