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

Convert 'abcpassword' to 'abcpass' during setup 

This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
This commit is contained in:
Robin McCorkell 2015-03-07 13:10:43 +00:00
parent 73c2157171
commit f43b047636
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/setup/controller.php
View File

@ -55,6 +55,14 @@ class Controller {
$post = $this->loadAutoConfig($post); $post = $this->loadAutoConfig($post);
$opts = $this->getSystemInfo(); $opts = $this->getSystemInfo();
// convert 'abcpassword' to 'abcpass'
if (isset($post['adminpassword'])) {
$post['adminpass'] = $post['adminpassword'];
}
if (isset($post['dbpassword'])) {
$post['dbpass'] = $post['dbpassword'];
}
if(isset($post['install']) AND $post['install']=='true') { if(isset($post['install']) AND $post['install']=='true') {
// We have to launch the installation process : // We have to launch the installation process :
$e = \OC\Setup::install($post); $e = \OC\Setup::install($post);