mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7720 from ideaship/autoconfig_fix 

fix autoconfig
This commit is contained in:
Vincent Petry 2014-03-28 10:41:46 +01:00
parent 5fa8f7cf12 a5425e84f2
commit 0436453353
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/setup/controller.php
View File

@ -20,7 +20,7 @@ class Controller {
$errors = array('errors' => $e);
if(count($e) > 0) {
$options = array_merge($post, $opts, $errors);
$options = array_merge($opts, $post, $errors);
$this->display($options);
}
else {
@ -28,7 +28,8 @@ class Controller {
}
}
else {
$this->display($opts);
$options = array_merge($opts, $post);
$this->display($options);
}
}
@ -41,6 +42,7 @@ class Controller {
'dbname' => '',
'dbtablespace' => '',
'dbhost' => '',
'dbtype' => '',
);
$parameters = array_merge($defaults, $post);