Proper connection exception handling in the DB functional tests.

diff --git a/admin/report/unittest/dbtest.php b/admin/report/unittest/dbtest.php
index cf9feab31784f2155b6996f44ee799d01756aa95..574fcdb966a8a76c7636835922fc600956497304 100644 (file)
--- a/admin/report/unittest/dbtest.php
+++ b/admin/report/unittest/dbtest.php
@@ -54,13 +54,16 @@ for ($i=1; $i<=10; $i++) {
     }
     $dbinfos[$i]['installed'] = true;
 
-    if ($d->connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions)) {
+    try {
+        $d->connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions);
         $dbinfos[$i]['configured'] = true;
         if (data_submitted() and !empty($selected[$i])) {
             $tests[$i] = $d;
         } else {
             $d->dispose();
         }
+    } catch (dml_connection_exception $e) {
+        $dbinfos[$i]['configured'] = false;
     }
 }