upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/base.php
View file

@ -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();