Extract common variables of $connectionParams.

diff --git a/lib/private/db.php b/lib/private/db.php
index d3bf8c0016cc6d6c69f83ae3590b55048e1048d0..6f0596f328eeb567eda0e0e9b7c84fb28564b57c 100644 (file)
--- 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;