Merge mmn's 'nightly' changes

[quix0rs-gnu-social.git] / lib / installer.php

diff --git a/lib/installer.php b/lib/installer.php
index dc4c7786a8d007c93155ad9f75a85e637f924573..cea7d29ec7df621801ffaeb934fc5fd7462b65ed 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -293,6 +293,11 @@ abstract class Installer
             }
         }
 
+        if (!$conn instanceof DB_common) {
+            // Is not the right instance
+            throw new Exception('Cannot connect to database: ' . $conn->getMessage());
+        }
+
         $res = $this->updateStatus("Creating database tables...");
         if (!$this->createCoreTables($conn)) {
             $this->updateStatus("Error creating tables.", true);