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

pull/88/head
Aleksander Machniak 11 years ago
parent dd12eec622
commit 8b81c61396

@ -1,6 +1,7 @@
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)
RELEASE 0.9.2

@ -139,10 +139,11 @@ foreach ($RCI->supported_dbs as $database => $ext) {
if (extension_loaded($ext)) {
// MySQL driver requires PHP >= 5.3 (#1488875)
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 {
$RCI->pass($database);
$found_db_driver = true;
}
}
else {
@ -152,6 +153,9 @@ foreach ($RCI->supported_dbs as $database => $ext) {
}
echo '<br />';
}
if (empty($found_db_driver)) {
$RCI->failures++;
}
?>

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

Loading…
Cancel
Save