diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-06 14:35:31 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-06 14:35:31 +0100 |
| commit | 0d94da7e9ef9550c8ae0244b203ca84e5ee007b0 (patch) | |
| tree | a13c3a98bac1130d084a173e9ac324aacad59941 | |
| parent | aff1cafaca01b9ba2d429b47557fedce673df55c (diff) | |
| parent | e2625ae7aafc52f4b2869f2296d2de74a9b2c3a9 (diff) | |
| download | nextcloud-server-0d94da7e9ef9550c8ae0244b203ca84e5ee007b0.tar.gz nextcloud-server-0d94da7e9ef9550c8ae0244b203ca84e5ee007b0.zip | |
Merge pull request #7099 from owncloud/fix-autoconfig-master
fixing autoconfig handling
| -rw-r--r-- | core/setup/controller.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/setup/controller.php b/core/setup/controller.php index c628bda609b..58ed4d28dc0 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 )) { |