From e7fa2ce56d0c9e3d791f3c145febbb9ab16be838 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 18 Jun 2013 13:54:26 +0200
Subject: Fix so install do not fail when one of DB driver checks fails but
 other drivers exist (#1489178)

---
 installer/check.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'installer/check.php')

diff --git a/installer/check.php b/installer/check.php
index fcf35025e..bea8c42e0 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -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++;
+}
 
 ?>
 
-- 
cgit v1.2.3