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

Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 01:05:15 +01:00
parent e57a87f224
commit e944d7bed6
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
43 changed files with 76 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Module/Friendica.php
View file

@ -18,7 +18,6 @@ class Friendica extends BaseModule
{
public static function content(array $parameters = [])
{
$app = DI::app();
$config = DI::config();
$visibleAddonList = Addon::getVisibleList();
@ -48,7 +47,7 @@ class Friendica extends BaseModule
}
$tos = ($config->get('system', 'tosdisplay')) ?
L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', $app->getBaseURL()) :
L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', DI::baseUrl()->get()) :
'';
$blockList = $config->get('system', 'blocklist');
@ -75,7 +74,7 @@ class Friendica extends BaseModule
return Renderer::replaceMacros($tpl, [
'about' => L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
'<strong>' . FRIENDICA_VERSION . '</strong>',
$app->getBaseURL(),
DI::baseUrl()->get(),
'<strong>' . DB_UPDATE_VERSION . '</strong>',
'<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
'friendica' => L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
@ -125,7 +124,7 @@ class Friendica extends BaseModule
if (!empty($administrator)) {
$admin = [
'name' => $administrator['username'],
'profile' => $app->getBaseURL() . '/profile/' . $administrator['nickname'],
'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
];
}
}
@ -147,7 +146,7 @@ class Friendica extends BaseModule
$data = [
'version' => FRIENDICA_VERSION,
'url' => $app->getBaseURL(),
'url' => DI::baseUrl()->get(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
@ -157,7 +156,7 @@ class Friendica extends BaseModule
'site_name' => $config->get('config', 'sitename'),
'platform' => FRIENDICA_PLATFORM,
'info' => $config->get('config', 'info'),
'no_scrape_url' => $app->getBaseURL() . '/noscrape',
'no_scrape_url' => DI::baseUrl()->get() . '/noscrape',
];
header('Content-type: application/json; charset=utf-8');