diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-17 16:37:48 -0600 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-19 15:53:49 -0600 |
| commit | edd55b0ea9c13273695bf95d913f4dfc03e08c95 (patch) | |
| tree | 71bcb99c0d2b5fd16d97eadcc947e11488c23817 /lib/private/Setup/MySQL.php | |
| parent | c02527e41462133444881817b741f91ebf563b3b (diff) | |
| download | nextcloud-server-edd55b0ea9c13273695bf95d913f4dfc03e08c95.tar.gz nextcloud-server-edd55b0ea9c13273695bf95d913f4dfc03e08c95.zip | |
Use SystemConfig instead of AllConfig for DB stuff
* preparation for followup PRs to clean up the DB bootstrapping
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Setup/MySQL.php')
| -rw-r--r-- | lib/private/Setup/MySQL.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index f4ba0e7326a..9998ca401d9 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -58,7 +58,7 @@ class MySQL extends AbstractDatabase { $name = $this->dbName; $user = $this->dbUser; //we can't use OC_DB functions here because we need to connect as the administrative user. - $characterSet = \OC::$server->getSystemConfig()->getValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8'; + $characterSet = $this->config->getValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8'; $query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET $characterSet COLLATE ${characterSet}_bin;"; $connection->executeUpdate($query); } catch (\Exception $ex) { @@ -112,7 +112,7 @@ class MySQL extends AbstractDatabase { private function createSpecificUser($username, $connection) { try { //user already specified in config - $oldUser = $this->config->getSystemValue('dbuser', false); + $oldUser = $this->config->getValue('dbuser', false); //we don't have a dbuser specified in config if ($this->dbUser !== $oldUser) { @@ -157,7 +157,7 @@ class MySQL extends AbstractDatabase { ]); } - $this->config->setSystemValues([ + $this->config->setValues([ 'dbuser' => $this->dbUser, 'dbpassword' => $this->dbPassword, ]); |