1
0
Fork 0

Merge pull request #6725 from nupplaphil/6691-rendertime-fix

Addon loading fix
This commit is contained in:
Hypolite Petovan 2019-02-22 23:53:11 -05:00 committed by GitHub
commit c1896eee34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 4 deletions

View file

@ -360,10 +360,15 @@ class App
$this->getMode()->determine($this->basePath);
if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
Core\Hook::loadHooks();
$loader = new ConfigCacheLoader($this->basePath);
Core\Hook::callAll('load_config', $loader);
$this->config->getCache()->load($loader->loadCoreConfig('addon'), true);
$this->profiler->update(
$this->config->get('system', 'profiler', false),
$this->config->get('rendertime', 'callstack', false));
Core\Hook::loadHooks();
Core\Hook::callAll('load_config', $loader);
}
$this->loadDefaultTimezone();