From f43b047636b2ccbbdc323101bfa17b57ac5f210a Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@karoshi.org.uk>
Date: Sat, 7 Mar 2015 13:10:43 +0000
Subject: [PATCH] Convert 'abcpassword' to 'abcpass' during setup
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
---
core/setup/controller.php | 8 ++++++++
1 file changed, 8 insertions(+)
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);
--
GitLab