From e2625ae7aafc52f4b2869f2296d2de74a9b2c3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 5 Feb 2014 18:23:40 +0100 Subject: [PATCH] fixing autoconfig handling --- core/setup/controller.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/setup/controller.php b/core/setup/controller.php index c628bda609..58ed4d28dc 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -56,17 +56,18 @@ class Controller { } public function loadAutoConfig($post) { - $dbIsSet = isset($post['dbtype']); - $directoryIsSet = isset($post['directory']); - $adminAccountIsSet = isset($post['adminlogin']); - $autosetup_file = \OC::$SERVERROOT.'/config/autoconfig.php'; if( file_exists( $autosetup_file )) { \OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO); + $AUTOCONFIG = array(); include $autosetup_file; $post = array_merge ($post, $AUTOCONFIG); } + $dbIsSet = isset($post['dbtype']); + $directoryIsSet = isset($post['directory']); + $adminAccountIsSet = isset($post['adminlogin']); + if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) { $post['install'] = 'true'; if( file_exists( $autosetup_file )) {