diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-09 07:54:22 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-09 07:54:22 +0100 |
| commit | 674654c210791dfa86e994080f2a58d1c8486263 (patch) | |
| tree | ce42bcbd472279da97bcd318f203344b59e49706 /core | |
| parent | 174f8cef6489e6f2d43dad2ea515646937cc6442 (diff) | |
| parent | f43b047636b2ccbbdc323101bfa17b57ac5f210a (diff) | |
| download | nextcloud-server-674654c210791dfa86e994080f2a58d1c8486263.tar.gz nextcloud-server-674654c210791dfa86e994080f2a58d1c8486263.zip | |
Merge pull request #14743 from owncloud/autoconfig-password
Convert 'abcpassword' to 'abcpass' during setup
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); |