Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/installer.php b/lib/installer.php
index 971e2562b010d6fb5eb1897309943f32d5cbc46b..36f83a3ead5e723342022b2647d5ce8827e80c7e 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -299,7 +299,10 @@ abstract class Installer
             }
         }
 
-        if (!$conn instanceof DB_common) {
+        if (!is_object($conn)) {
+            // No object at all
+            throw new Exception('Fatal error: conn is no object.');
+        } elseif (!$conn instanceof DB_common) {
             // Is not the right instance
             throw new Exception('Cannot connect to database: ' . $conn->getMessage());
         }