summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-23 12:35:20 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-23 12:35:20 +0000
commitb94a82e5da0733183d0217b65b5a3f89939365c7 (patch)
treee826619dd6f3ed142ddce0302cc7613169c4201e
parent3e654087b2da38d40055ae8e9b144a263f446d88 (diff)
- Fix DB Schema checking when some db_table_* options are not set
git-svn-id: https://svn.roundcube.net/trunk@3556 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/installer/rcube_install.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index ae568d223..580aba858 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -353,10 +353,11 @@ class rcube_install
// check list of tables
$existing_tables = $DB->list_tables();
+
foreach ($db_schema as $table => $cols) {
- if (!in_array($this->config['db_table_'.$table], $existing_tables))
+ $table = !empty($this->config['db_table_'.$table]) ? $this->config['db_table_'.$table] : $table;
+ if (!in_array($table, $existing_tables))
$errors[] = "Missing table ".$table;
-
// TODO: check cols and indices
}