From 1b7b6be959fc7ef4952a3d5f8fde917b0264ac81 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 19 Apr 2013 03:28:36 -0400
Subject: [PATCH] Fix list of required configuration options (#1489055). Removed support_url, and db_table_*
---
CHANGELOG | 1 +
installer/rcube_install.php | 3 +--
installer/test.php | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index e82acfa..ebcd933 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix list of required configuration options (#1489055)
- Fix DB error when creating a new contact and a group is selected (#1489051)
- Fix handling of deprecated boolean value of reply_mode option (#1489052)
- Fix parsing invalid date string (#1489035)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index a6ded7d..b86ccab 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -46,8 +46,7 @@
// these config options are required for a working system
var $required_config = array(
- 'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers',
- 'des_key', 'session_lifetime', 'support_url',
+ 'db_dsnw', 'des_key', 'session_lifetime',
);
// list of supported database drivers
diff --git a/installer/test.php b/installer/test.php
index bd49ac5..340fe26 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -38,13 +38,13 @@
if (is_array($messages['missing'])) {
echo '<h3 class="warning">Missing config options</h3>';
- echo '<p class="hint">The following config options are not present in the current configuration.<br/>';
- echo 'Please check the default config files and add the missing properties to your local config files.</p>';
-
- echo '<ul class="configwarings">';
+ echo '<p class="hint">The following config options are not set (not present or empty) in the current configuration.<br/>';
+ echo 'Please check the default config files and set the missing properties in your local config files.</p>';
+
+ echo '<ul class="configwarnings">';
foreach ($messages['missing'] as $msg) {
echo html::tag('li', null, html::span('propname', $msg['prop']) . ($msg['name'] ? ': ' . $msg['name'] : ''));
- }
+ }
echo '</ul>';
}
--
Gitblit v1.9.1