X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FFriendica.php;h=90869878e47b131e32aab5c784a00902496419ac;hb=7fd1db0ec6b3c729e347f94ca961421fb4f5070e;hp=012f65ef69c826f4a2fc3a6b27b015e0f7504933;hpb=5cb5252095bc1c14121d49100fdc5069647331d8;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 012f65ef69..90869878e4 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
get('system', 'tosdisplay')) ?
- DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()->get()) :
+ DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()) :
'';
$blockList = $config->get('system', 'blocklist');
@@ -96,10 +98,10 @@ class Friendica extends BaseModule
return Renderer::replaceMacros($tpl, [
'about' => DI::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.',
- '' . FRIENDICA_VERSION . '',
- DI::baseUrl()->get(),
+ '' . App::VERSION . '',
+ DI::baseUrl(),
'' . $config->get('system', 'build') . '/' . DB_UPDATE_VERSION . '',
- '' . $config->get('system', 'post_update_version') . '/' . PostUpdate::VERSION . ''),
+ '' . $keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . ''),
'friendica' => DI::l10n()->t('Please visit Friendi.ca to learn more about the Friendica project.'),
'bugs' => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '' . DI::l10n()->t('the bugtracker at github') . '',
'info' => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
@@ -149,13 +151,13 @@ class Friendica extends BaseModule
if (!empty($administrator)) {
$admin = [
'name' => $administrator['username'],
- 'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
+ 'profile' => DI::baseUrl() . '/profile/' . $administrator['nickname'],
];
}
$visible_addons = Addon::getVisibleList();
- $config->load('feature_lock');
+ $config->reload();
$locked_features = [];
$featureLocks = $config->get('config', 'feature_lock');
if (isset($featureLocks)) {
@@ -169,8 +171,8 @@ class Friendica extends BaseModule
}
$data = [
- 'version' => FRIENDICA_VERSION,
- 'url' => DI::baseUrl()->get(),
+ 'version' => App::VERSION,
+ 'url' => (string)DI::baseUrl(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
@@ -178,9 +180,9 @@ class Friendica extends BaseModule
'register_policy' => $register_policy,
'admin' => $admin,
'site_name' => $config->get('config', 'sitename'),
- 'platform' => strtolower(FRIENDICA_PLATFORM),
+ 'platform' => strtolower(App::PLATFORM),
'info' => $config->get('config', 'info'),
- 'no_scrape_url' => DI::baseUrl()->get() . '/noscrape',
+ 'no_scrape_url' => DI::baseUrl() . '/noscrape',
];
System::jsonExit($data);