summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-05 10:19:01 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-05 10:19:01 +0000
commitcdbe41001900306b7b970bb2c86772844ae845f8 (patch)
tree1e19334a41445d156043b6eca14fa44324e35240 /roundcubemail
parentf265ed1c00dc96396416cdcc4f7d8a674ba860d3 (diff)
#1485313: fixed DB config updating
git-svn-id: https://svn.roundcube.net/trunk@1740 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/installer/rcube_install.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index e3382537e..0c4544f5b 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -122,7 +122,7 @@ class rcube_install
if (!$out)
return '[Warning: could not read the template file]';
-
+
foreach ($this->config as $prop => $default) {
$value = (isset($_POST["_$prop"]) || $this->config_props[$prop]) ? $_POST["_$prop"] : $default;
@@ -134,7 +134,7 @@ class rcube_install
$val += intval($dbgval);
$value = $val;
}
- else if ($prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
+ else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
if ($_POST['_dbtype'] == 'sqlite')
$value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
else
@@ -179,7 +179,7 @@ class rcube_install
"'\\1 = ' . var_export(\$value, true) . ';'",
$out);
}
-
+
return trim($out);
}