replace calls for App::getBasePath() with AppHelper

This commit is contained in:
Art4 2024-11-10 10:57:13 +00:00
parent 79f9e78daf
commit ae75ffc31a
7 changed files with 26 additions and 23 deletions

View file

@ -29,7 +29,7 @@ class Summary extends BaseAdmin
{
parent::content();
$a = DI::app();
$basePath = DI::apphelper()->getBasePath();
// are there MyISAM tables in the DB? If so, trigger a warning message
$warningtext = [];
@ -120,7 +120,7 @@ class Summary extends BaseAdmin
}
// check legacy basepath settings
$configLoader = (new Config())->createConfigFileManager($a->getBasePath(), $_SERVER);
$configLoader = (new Config())->createConfigFileManager($basePath, $_SERVER);
$configCache = new Cache();
$configLoader->setupCache($configCache);
$confBasepath = $configCache->get('system', 'basepath');

View file

@ -32,7 +32,7 @@ class Home extends BaseModule
protected function content(array $request = []): string
{
$app = DI::app();
$basePath = DI::apphelper()->getBasePath();
$config = DI::config();
// currently no returned data is used
@ -51,8 +51,8 @@ class Home extends BaseModule
$customHome = '';
$defaultHeader = ($config->get('config', 'sitename') ? DI::l10n()->t('Welcome to %s', $config->get('config', 'sitename')) : '');
$homeFilePath = $app->getBasePath() . '/home.html';
$cssFilePath = $app->getBasePath() . '/home.css';
$homeFilePath = $basePath . '/home.html';
$cssFilePath = $basePath . '/home.css';
if (file_exists($homeFilePath)) {
$customHome = $homeFilePath;