aboutsummaryrefslogtreecommitdiff
path: root/src/private/conf.php
diff options
context:
space:
mode:
authorCassio de Campos <cassiopc@gmail.com>2017-10-24 14:58:09 +0000
committerCassio de Campos <cassiopc@gmail.com>2017-10-24 14:58:09 +0000
commitaaee4537fc9201e9d6a242583d82fd1bea97928c (patch)
treeff57c7f621382492910292b490d9c67e6f99e739 /src/private/conf.php
parent006561454093d44a789463d531cfbc640c519867 (diff)
parent2c862aa5c6ac4afe4005582fc836b13775a99eac (diff)
downloadboca-aaee4537fc9201e9d6a242583d82fd1bea97928c.tar.gz
boca-aaee4537fc9201e9d6a242583d82fd1bea97928c.zip
Merge branch 'devel'
Diffstat (limited to 'src/private/conf.php')
-rw-r--r--src/private/conf.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/private/conf.php b/src/private/conf.php
index 9ad1a80..71956c0 100644
--- a/src/private/conf.php
+++ b/src/private/conf.php
@@ -20,8 +20,9 @@
function globalconf() {
$conf["dbencoding"]="UTF8";
$conf["dbclientenc"]="UTF8";
+ $conf['doenc']=FALSE;
- $conf["dblocal"]="false"; // use unix socket to connect?
+ $conf["dblocal"]="false"; // use unix socket to connect?
$conf["dbhost"]="localhost";
$conf["dbport"]="5432";