summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-07-04 13:03:30 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-07-04 13:03:30 +0200
commit657eef354a68f8ee7fe38f1406ac1690310e433b (patch)
tree5cf0756fe2cca41a93e589a89f73df7b8a42c90a /lib
parentf98bd1ad66eae6421ec56a65b7b726f27cd2e027 (diff)
parent3b09aa8578702a403e06e6359a19013b573443bc (diff)
downloadnextcloud-server-657eef354a68f8ee7fe38f1406ac1690310e433b.tar.gz
nextcloud-server-657eef354a68f8ee7fe38f1406ac1690310e433b.zip
Merge branch 'master' into calendar_import
Diffstat (limited to 'lib')
-rw-r--r--lib/db.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/db.php b/lib/db.php
index ffa0d37307a..2a06d72ea32 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -128,6 +128,14 @@ class OC_DB {
}else{
$dsn='pgsql:dbname='.$name.';host='.$host;
}
+ /**
+ * Ugly fix for pg connections pbm when password use spaces
+ */
+ $e_user = addslashes($user);
+ $e_password = addslashes($pass);
+ $pass = $user = null;
+ $dsn .= ";user='$e_user';password='$e_password'";
+ /** END OF FIX***/
break;
}
try{