Merge pull request #7099 from owncloud/fix-autoconfig-master
fixing autoconfig handling
This commit is contained in:
commit
0d94da7e9e
|
@ -56,17 +56,18 @@ class Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function loadAutoConfig($post) {
|
public function loadAutoConfig($post) {
|
||||||
$dbIsSet = isset($post['dbtype']);
|
|
||||||
$directoryIsSet = isset($post['directory']);
|
|
||||||
$adminAccountIsSet = isset($post['adminlogin']);
|
|
||||||
|
|
||||||
$autosetup_file = \OC::$SERVERROOT.'/config/autoconfig.php';
|
$autosetup_file = \OC::$SERVERROOT.'/config/autoconfig.php';
|
||||||
if( file_exists( $autosetup_file )) {
|
if( file_exists( $autosetup_file )) {
|
||||||
\OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO);
|
\OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO);
|
||||||
|
$AUTOCONFIG = array();
|
||||||
include $autosetup_file;
|
include $autosetup_file;
|
||||||
$post = array_merge ($post, $AUTOCONFIG);
|
$post = array_merge ($post, $AUTOCONFIG);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$dbIsSet = isset($post['dbtype']);
|
||||||
|
$directoryIsSet = isset($post['directory']);
|
||||||
|
$adminAccountIsSet = isset($post['adminlogin']);
|
||||||
|
|
||||||
if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
|
if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
|
||||||
$post['install'] = 'true';
|
$post['install'] = 'true';
|
||||||
if( file_exists( $autosetup_file )) {
|
if( file_exists( $autosetup_file )) {
|
||||||
|
|
Loading…
Reference in New Issue