diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-03 15:24:58 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-03 15:24:58 +0100 |
| commit | ec366f625ebfbe870d832fe1341966c5d6091827 (patch) | |
| tree | 4c9c46e319d23d6ab4cda6ea67d6437a909c485f | |
| parent | 0fe5506e9172154544d798d2501ec16f34fae730 (diff) | |
| parent | aa0265bd34cdb14baa234832f226ef4da7d1e711 (diff) | |
| download | nextcloud-server-ec366f625ebfbe870d832fe1341966c5d6091827.tar.gz nextcloud-server-ec366f625ebfbe870d832fe1341966c5d6091827.zip | |
Merge pull request #20923 from owncloud/OC_Config-in-setup
Replace OC_Config in setup
| -rw-r--r-- | lib/private/setup/postgresql.php | 7 | ||||
| -rw-r--r-- | lib/private/setup/sqlite.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php index 0a559e7a589..59762209d08 100644 --- a/lib/private/setup/postgresql.php +++ b/lib/private/setup/postgresql.php @@ -66,7 +66,8 @@ class PostgreSQL extends AbstractDatabase { $this->createDBUser($connection); } - \OC_Config::setValues([ + $systemConfig = \OC::$server->getSystemConfig(); + $systemConfig->setValues([ 'dbuser' => $this->dbUser, 'dbpassword' => $this->dbPassword, ]); @@ -78,8 +79,8 @@ class PostgreSQL extends AbstractDatabase { pg_close($connection); // connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled - $this->dbUser = \OC_Config::getValue('dbuser'); - $this->dbPassword = \OC_Config::getValue('dbpassword'); + $this->dbUser = $systemConfig->getValue('dbuser'); + $this->dbPassword = $systemConfig->getValue('dbpassword'); $e_host = addslashes($this->dbHost); $e_dbname = addslashes($this->dbName); diff --git a/lib/private/setup/sqlite.php b/lib/private/setup/sqlite.php index 820a89d4cff..ce6005620eb 100644 --- a/lib/private/setup/sqlite.php +++ b/lib/private/setup/sqlite.php @@ -31,7 +31,7 @@ class Sqlite extends AbstractDatabase { } public function setupDatabase($username) { - $datadir = \OC_Config::getValue('datadirectory'); + $datadir = \OC::$server->getSystemConfig()->getValue('datadirectory'); //delete the old sqlite database first, might cause infinte loops otherwise if(file_exists("$datadir/owncloud.db")) { |