diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-29 11:22:44 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-29 11:22:44 -0800 |
| commit | 338a55e36cf8507156cc4d943cd301ec0361c930 (patch) | |
| tree | 4c4b2424aff1dede0bdee8dda3cec878fa1d5488 /core | |
| parent | 1b18c5a047e451b77a777f94602603761d9f6816 (diff) | |
| parent | 2ec085b51fc5f3652fc4381db5944e7b035eaf0a (diff) | |
| download | nextcloud-server-338a55e36cf8507156cc4d943cd301ec0361c930.tar.gz nextcloud-server-338a55e36cf8507156cc4d943cd301ec0361c930.zip | |
Merge pull request #6128 from owncloud/fix-6126-master
Also merge autoconfig variables into $_REQUEST.
Diffstat (limited to 'core')
| -rw-r--r-- | core/setup.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/setup.php b/core/setup.php index 4026a748453..781d6e572af 100644 --- a/core/setup.php +++ b/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']); |