Little fixes (#5414)
* We now store the item delivery data in a separate table * Reorganized table structure * Fix a notice when using the profiler / ensure that permissions are strings
This commit is contained in:
committed by
Hypolite Petovan
parent
b2899d76cf
commit
01b67c4eb3
38
src/App.php
38
src/App.php
@@ -154,25 +154,6 @@ class App
|
||||
|
||||
$this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
|
||||
|
||||
// The order of the following calls is important to ensure proper initialization
|
||||
$this->loadConfigFiles();
|
||||
|
||||
$this->loadDatabase();
|
||||
|
||||
$this->determineMode();
|
||||
|
||||
$this->determineUrlPath();
|
||||
|
||||
Config::load();
|
||||
|
||||
if ($this->mode & self::MODE_DBAVAILABLE) {
|
||||
Core\Addon::loadHooks();
|
||||
|
||||
$this->loadAddonConfig();
|
||||
}
|
||||
|
||||
$this->loadDefaultTimezone();
|
||||
|
||||
$this->performance['start'] = microtime(true);
|
||||
$this->performance['database'] = 0;
|
||||
$this->performance['database_write'] = 0;
|
||||
@@ -194,6 +175,25 @@ class App
|
||||
$this->callstack['rendering'] = [];
|
||||
$this->callstack['parser'] = [];
|
||||
|
||||
// The order of the following calls is important to ensure proper initialization
|
||||
$this->loadConfigFiles();
|
||||
|
||||
$this->loadDatabase();
|
||||
|
||||
$this->determineMode();
|
||||
|
||||
$this->determineUrlPath();
|
||||
|
||||
Config::load();
|
||||
|
||||
if ($this->mode & self::MODE_DBAVAILABLE) {
|
||||
Core\Addon::loadHooks();
|
||||
|
||||
$this->loadAddonConfig();
|
||||
}
|
||||
|
||||
$this->loadDefaultTimezone();
|
||||
|
||||
$this->page = [
|
||||
'aside' => '',
|
||||
'bottom' => '',
|
||||
|
||||
Reference in New Issue
Block a user