Merge pull request #6128 from owncloud/fix-6126-master

Also merge autoconfig variables into $_REQUEST.
remotes/origin/stable6
Thomas Müller 11 years ago
commit 338a55e36c
  1. 1
      core/setup.php

@ -6,6 +6,7 @@ if( file_exists( $autosetup_file )) {
OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', OC_Log::INFO);
include $autosetup_file;
$_POST = array_merge ($_POST, $AUTOCONFIG);
$_REQUEST = array_merge ($_REQUEST, $AUTOCONFIG);
}
$dbIsSet = isset($_POST['dbtype']);

Loading…
Cancel
Save