Fix so install do not fail when one of DB driver checks fails but other drivers exist (#1489178)

pull/82/head
Aleksander Machniak 12 years ago
parent b531277d03
commit e7fa2ce56d

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix so install do not fail when one of DB driver checks fails but other drivers exist (#1489178)
- Fix so exported vCard specifies encoding in v3-compatible format (#1489183) - Fix so exported vCard specifies encoding in v3-compatible format (#1489183)
- Fix session issues when local and database time differs (#1486132) - Fix session issues when local and database time differs (#1486132)
- Fix thread cache syncronization/validation (#1489028) - Fix thread cache syncronization/validation (#1489028)

@ -139,10 +139,11 @@ foreach ($RCI->supported_dbs as $database => $ext) {
if (extension_loaded($ext)) { if (extension_loaded($ext)) {
// MySQL driver requires PHP >= 5.3 (#1488875) // MySQL driver requires PHP >= 5.3 (#1488875)
if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) { if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) {
$RCI->fail($database, 'PHP >= 5.3 required'); $RCI->fail($database, 'PHP >= 5.3 required', null, true);
} }
else { else {
$RCI->pass($database); $RCI->pass($database);
$found_db_driver = true;
} }
} }
else { else {
@ -152,6 +153,9 @@ foreach ($RCI->supported_dbs as $database => $ext) {
} }
echo '<br />'; echo '<br />';
} }
if (empty($found_db_driver)) {
$RCI->failures++;
}
?> ?>

@ -496,10 +496,13 @@ class rcube_install
* @param string Test name * @param string Test name
* @param string Error message * @param string Error message
* @param string URL for details * @param string URL for details
* @param bool Do not count this failure
*/ */
function fail($name, $message = '', $url = '') function fail($name, $message = '', $url = '', $optional=false)
{ {
if (!$optional) {
$this->failures++; $this->failures++;
}
echo Q($name) . ':&nbsp; <span class="fail">NOT OK</span>'; echo Q($name) . ':&nbsp; <span class="fail">NOT OK</span>';
$this->_showhint($message, $url); $this->_showhint($message, $url);

Loading…
Cancel
Save