Skip to content
Snippets Groups Projects
Commit f43b0476 authored by Robin McCorkell's avatar Robin McCorkell
Browse files

Convert 'abcpassword' to 'abcpass' during setup

This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
parent 73c21571
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,14 @@ class Controller { ...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment