From d6707475ccf0462849309ac1ab902d37b72c4ff9 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 28 Jun 2013 15:08:53 -0400
Subject: [PATCH] Flag config as 'legacy'; remove config file switch
---
installer/rcube_install.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 8165401..5d766f4 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -97,9 +97,11 @@
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 @@
$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'])
--
Gitblit v1.9.1