Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index e298df668c572f6977c4695139484aecabc24e48..575d3443fb4d59bd3e73a5a9eb0a9261abe52569 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -13,7 +13,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -513,8 +512,8 @@ function profiles_content(App $a) {
                        return;
                }
 
-               $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
-                       '$baseurl' => System::baseUrl(true),
+               DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
+                       '$baseurl' => DI::baseUrl()->get(true),
                ]);
 
                $opt_tpl = Renderer::getMarkupTemplate("profile-hide-friends.tpl");
@@ -588,7 +587,7 @@ function profiles_content(App $a) {
                        '$lbl_ex2' => L10n::t('Example: fishing photography software'),
 
                        '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
-                       '$baseurl' => System::baseUrl(true),
+                       '$baseurl' => DI::baseUrl()->get(true),
                        '$profile_id' => $r[0]['id'],
                        '$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'],
                        '$is_default'   => $is_default,
@@ -655,7 +654,7 @@ function profiles_content(App $a) {
                        $profiles = '';
                        foreach ($r as $rr) {
                                $profiles .= Renderer::replaceMacros($tpl, [
-                                       '$photo'        => $a->removeBaseURL($rr['thumb']),
+                                       '$photo'        => DI::baseUrl()->remove($rr['thumb']),
                                        '$id'           => $rr['id'],
                                        '$alt'          => L10n::t('Profile Image'),
                                        '$profile_name' => $rr['profile-name'],