mirror of
https://github.com/friendica/friendica
synced 2025-02-07 09:38:51 +00:00
Inject AppHelper into App::load() via parameter
This commit is contained in:
parent
e57424ec35
commit
7cc37ff2cb
1 changed files with 4 additions and 2 deletions
|
@ -165,6 +165,7 @@ class App
|
||||||
$this->mode,
|
$this->mode,
|
||||||
$this->config,
|
$this->config,
|
||||||
$this->profiler,
|
$this->profiler,
|
||||||
|
$this->appHelper,
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->registerTemplateEngine();
|
$this->registerTemplateEngine();
|
||||||
|
@ -280,7 +281,8 @@ class App
|
||||||
ViewDefinition $viewDefinition,
|
ViewDefinition $viewDefinition,
|
||||||
Mode $mode,
|
Mode $mode,
|
||||||
IManageConfigValues $config,
|
IManageConfigValues $config,
|
||||||
Profiler $profiler
|
Profiler $profiler,
|
||||||
|
AppHelper $appHelper
|
||||||
): void {
|
): void {
|
||||||
if ($config->get('system', 'ini_max_execution_time') !== false) {
|
if ($config->get('system', 'ini_max_execution_time') !== false) {
|
||||||
set_time_limit((int) $config->get('system', 'ini_max_execution_time'));
|
set_time_limit((int) $config->get('system', 'ini_max_execution_time'));
|
||||||
|
@ -302,7 +304,7 @@ class App
|
||||||
|
|
||||||
if ($mode->has(Mode::DBAVAILABLE)) {
|
if ($mode->has(Mode::DBAVAILABLE)) {
|
||||||
Core\Hook::loadHooks();
|
Core\Hook::loadHooks();
|
||||||
$loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $serverParams);
|
$loader = (new Config())->createConfigFileManager($appHelper->getBasePath(), $serverParams);
|
||||||
Core\Hook::callAll('load_config', $loader);
|
Core\Hook::callAll('load_config', $loader);
|
||||||
|
|
||||||
// Hooks are now working, reload the whole definitions with hook enabled
|
// Hooks are now working, reload the whole definitions with hook enabled
|
||||||
|
|
Loading…
Add table
Reference in a new issue