|
@@ -136,7 +136,7 @@ discard block |
|
|
block discarded – undo |
|
136
|
136
|
if ($host === '') { |
|
137
|
137
|
$additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name |
|
138
|
138
|
} else { |
|
139
|
|
- $additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName; |
|
|
139
|
+ $additionalConnectionParams['dbname'] = '//'.$host.(!empty($port) ? ":{$port}" : "").'/'.$dbName; |
|
140
|
140
|
} |
|
141
|
141
|
unset($additionalConnectionParams['host']); |
|
142
|
142
|
break; |
|
@@ -191,8 +191,8 @@ discard block |
|
|
block discarded – undo |
|
191
|
191
|
$name = $this->config->getValue('dbname', 'owncloud'); |
|
192
|
192
|
|
|
193
|
193
|
if ($this->normalizeType($type) === 'sqlite3') { |
|
194
|
|
- $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data'); |
|
195
|
|
- $connectionParams['path'] = $dataDir . '/' . $name . '.db'; |
|
|
194
|
+ $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT.'/data'); |
|
|
195
|
+ $connectionParams['path'] = $dataDir.'/'.$name.'.db'; |
|
196
|
196
|
} else { |
|
197
|
197
|
$host = $this->config->getValue('dbhost', ''); |
|
198
|
198
|
if (strpos($host, ':') && !strstr($host, '[')) { |
Please login to merge, or discard this patch.