diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-03-07 13:10:43 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-03-07 13:10:43 +0000 |
| commit | f43b047636b2ccbbdc323101bfa17b57ac5f210a (patch) | |
| tree | 446235f21e98b3f1eb42596bc90b58e1b3a0719a /core | |
| parent | 73c21571710b58f6eef807efae991403f00577d7 (diff) | |
| download | nextcloud-server-f43b047636b2ccbbdc323101bfa17b57ac5f210a.tar.gz nextcloud-server-f43b047636b2ccbbdc323101bfa17b57ac5f210a.zip | |
Convert 'abcpassword' to 'abcpass' during setup
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
Diffstat (limited to 'core')
| -rw-r--r-- | core/setup/controller.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/setup/controller.php b/core/setup/controller.php index 8465008d573..cc7f4a3a985 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -55,6 +55,14 @@ class Controller { $post = $this->loadAutoConfig($post); $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') { // We have to launch the installation process : $e = \OC\Setup::install($post); |