Make sure we don't query the AppManager before the installation started

Otherwise we end up with the database not being instantiated

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-01-29 13:15:05 +01:00
parent 9a73a1f063
commit f23ed5e0ea
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
1 changed files with 5 additions and 2 deletions

View File

@ -723,8 +723,11 @@ class OC {
self::registerAccountHooks(); self::registerAccountHooks();
self::registerSettingsHooks(); self::registerSettingsHooks();
$settings = new \OC\Settings\Application(); // Make sure that the application class is not loaded before the database is setup
$settings->register(); if ($systemConfig->getValue("installed", false)) {
$settings = new \OC\Settings\Application();
$settings->register();
}
//make sure temporary files are cleaned up //make sure temporary files are cleaned up
$tmpManager = \OC::$server->getTempManager(); $tmpManager = \OC::$server->getTempManager();