aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/private/db.php19
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/private/db.php b/lib/private/db.php
index d3bf8c0016c..6f0596f328e 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -74,20 +74,17 @@ class OC_DB {
return false;
}
+ $connectionParams = array(
+ 'user' => $user,
+ 'password' => $pass,
+ );
+
if ($factory->normalizeType($type) === 'sqlite3') {
$datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data');
- $connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
- 'path' => $datadir.'/'.$name.'.db',
- );
+ $connectionParams['path'] = $datadir.'/'.$name.'.db';
} else {
- $connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
- 'host' => $host,
- 'dbname' => $name,
- );
+ $connectionParams['host'] = $host;
+ $connectionParams['dbname'] = $name;
if ($socket) {
if (ctype_digit($socket) && $socket <= 65535) {
$connectionParams['port'] = $socket;