From: Mikael Nordfeldth Date: Thu, 1 Sep 2016 23:01:57 +0000 (+0200) Subject: Merge branch 'master' of git.gnu.io:gnu/gnu-social X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18670c69b27e499b2d84efd48185624d223027b9;hp=a7043bf7cc6956abd344149332290564eda5d1f4;p=quix0rs-gnu-social.git Merge branch 'master' of git.gnu.io:gnu/gnu-social --- diff --git a/lib/installer.php b/lib/installer.php index d2fda92560..346c706d61 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -285,6 +285,11 @@ abstract class Installer $this->updateStatus("Checking database..."); $conn = $this->connectDatabase($dsn); + if (!$conn instanceof DB_common) { + // Is not the right instance + throw new Exception('Cannot connect to database: ' . $conn->getMessage()); + } + // ensure database encoding is UTF8 if ($this->dbtype == 'mysql') { // @fixme utf8m4 support for mysql 5.5? @@ -299,11 +304,6 @@ 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);