diff options
Diffstat (limited to 'lib/base.php')
-rw-r--r-- | lib/base.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index e957d6be089..107ae059bb1 100644 --- a/lib/base.php +++ b/lib/base.php @@ -566,7 +566,7 @@ class OC { } catch(\Exception $e) { echo('Writing to database failed'); } - exit(); + exit(1); } else { OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); OC_Template::printGuestPage('', 'error', array('errors' => $errors)); @@ -747,7 +747,8 @@ class OC { // Check if ownCloud is installed or in maintenance (update) mode if (!$systemConfig->getValue('installed', false)) { \OC::$server->getSession()->clear(); - $controller = new OC\Core\Setup\Controller(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), \OC::$server->getL10N('core'), new \OC_Defaults()); + $setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), new \OC_Defaults()); + $controller = new OC\Core\Setup\Controller($setupHelper); $controller->run($_POST); exit(); } |