summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-06-17 15:56:52 +0200
committerVincent Petry <pvince81@owncloud.com>2014-06-17 15:56:52 +0200
commitc5e33f517218421d5b4e6984bcdf84117434a357 (patch)
tree7d799a5ffbd3055c730c3afad15d4a5420e11154
parenta548de36119852a15f7feba548a44ab306507d79 (diff)
parent9db0a82a2666c554b3bf51621985cfd8d3c2feb9 (diff)
downloadnextcloud-server-c5e33f517218421d5b4e6984bcdf84117434a357.tar.gz
nextcloud-server-c5e33f517218421d5b4e6984bcdf84117434a357.zip
Merge pull request #9067 from owncloud/pass-db-hostname
Obviously have to pass the hostname as is when there is no ':' in the hostname
-rw-r--r--lib/private/db.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/db.php b/lib/private/db.php
index 8fd2ef1c6f7..6aaf31a30cd 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -78,12 +78,12 @@ class OC_DB {
// Host variable may carry a port or socket.
list($host, $portOrSocket) = explode(':', $host, 2);
if (ctype_digit($portOrSocket)) {
- $connectionParams['host'] = $host;
$connectionParams['port'] = $portOrSocket;
} else {
$connectionParams['unix_socket'] = $portOrSocket;
}
}
+ $connectionParams['host'] = $host;
$connectionParams['dbname'] = $name;
}