summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-06-28 21:08:53 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-06-28 21:08:53 +0200
commitd6707475ccf0462849309ac1ab902d37b72c4ff9 (patch)
tree5ac1b1e6fcff61e4c69fefbd32ec8b34c0f445eb
parentacc005301f28b92dc922d629c4a616931cc9f69b (diff)
Flag config as 'legacy'; remove config file switch
-rw-r--r--installer/rcube_install.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 8165401a3..5d766f4d0 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -97,9 +97,11 @@ class rcube_install
else {
if ($config = $this->load_config_file(RCUBE_CONFIG_DIR . 'main.inc.php')) {
$this->config = array_merge($this->config, $config);
+ $this->legacy_config = true;
}
if ($config = $this->load_config_file(RCUBE_CONFIG_DIR . 'db.inc.php')) {
$this->config = array_merge($this->config, $config);
+ $this->legacy_config = true;
}
}
@@ -164,7 +166,7 @@ class rcube_install
$value = $val;
}
}
- else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
+ else if ($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 if ($_POST['_dbtype'])