diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-01-29 13:15:05 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-01-30 19:05:49 +0100 |
| commit | f23ed5e0eaaec63903e92e61f1124209c8a33155 (patch) | |
| tree | fb648eb2b6785335ce711c3a88eacb08ec4dd9f3 /lib/base.php | |
| parent | 9a73a1f0635b05ff94e23cf7ac3918b130aef348 (diff) | |
| download | nextcloud-server-f23ed5e0eaaec63903e92e61f1124209c8a33155.tar.gz nextcloud-server-f23ed5e0eaaec63903e92e61f1124209c8a33155.zip | |
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>
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 444c0df7e9e..f7dd3025b71 100644 --- a/lib/base.php +++ b/lib/base.php @@ -723,8 +723,11 @@ class OC { self::registerAccountHooks(); self::registerSettingsHooks(); - $settings = new \OC\Settings\Application(); - $settings->register(); + // Make sure that the application class is not loaded before the database is setup + if ($systemConfig->getValue("installed", false)) { + $settings = new \OC\Settings\Application(); + $settings->register(); + } //make sure temporary files are cleaned up $tmpManager = \OC::$server->getTempManager(); |