From 675fd21cf145ff882463d604fe9e4bf9defa256e Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Sun, 3 Feb 2013 02:35:13 -0500
Subject: Add a check that makes sure PDO is available

Calling an unavailable class is a fatal error, so people without PDO
were left with a fairly useless blank screen and no indicator of what
was wrong. Let's be a bit more user-friendly.
---
 templates/show_test.inc.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index fcd6c703..6a2b2b2b 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -61,6 +61,16 @@
     <?php echo $string; ?>
     </td>
 </tr>
+<tr>
+    <td valign="top"><?php echo T_('PHP PDO'); ?></td>
+    <td valign="top">[
+    <?php   echo debug_result('', check_pdo()); ?>
+    ]
+    </td>
+    <td>
+    <?php echo T_('This tests whether the PDO extension and the MySQL driver for PDO are installed. These are required by Ampache.'); ?>
+    </td>
+</tr>
 <tr>
     <td valign="top"><?php echo T_('PHP session extension'); ?></td>
     <td valign="top">[
@@ -170,7 +180,7 @@
     <td valign="top"><?php echo T_("Database connection"); ?></td>
     <td valign="top">[
     <?php
-        if (!Dba::check_database()) {
+        if (!check_pdo() || !Dba::check_database()) {
             echo debug_result('',false);
         }
         else {
@@ -187,7 +197,7 @@
     <td valign="top"><?php echo T_('Database tables'); ?></td>
     <td valign="top">[
     <?php
-        $db_inserted = Dba::check_database_inserted();
+        $db_inserted = check_pdo() ? Dba::check_database_inserted() : false;
         if (!$db_inserted) {
             echo debug_result('',false);
         }
-- 
cgit