Merge pull request #6128 from owncloud/fix-6126-master
Also merge autoconfig variables into $_REQUEST.
This commit is contained in:
commit
338a55e36c
|
@ -6,6 +6,7 @@ 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);
|
||||||
include $autosetup_file;
|
include $autosetup_file;
|
||||||
$_POST = array_merge ($_POST, $AUTOCONFIG);
|
$_POST = array_merge ($_POST, $AUTOCONFIG);
|
||||||
|
$_REQUEST = array_merge ($_REQUEST, $AUTOCONFIG);
|
||||||
}
|
}
|
||||||
|
|
||||||
$dbIsSet = isset($_POST['dbtype']);
|
$dbIsSet = isset($_POST['dbtype']);
|
||||||
|
|
Loading…
Reference in New Issue