GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into mmn_fixes

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-09-02 01:04:54 +02:00
commit 500ff6be1a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/installer.php
View File

@ -285,6 +285,11 @@ abstract class Installer
$this->updateStatus("Checking database..."); $this->updateStatus("Checking database...");
$conn = $this->connectDatabase($dsn); $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 // ensure database encoding is UTF8
if ($this->dbtype == 'mysql') { if ($this->dbtype == 'mysql') {
// @fixme utf8m4 support for mysql 5.5? // @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..."); $res = $this->updateStatus("Creating database tables...");
if (!$this->createCoreTables($conn)) { if (!$this->createCoreTables($conn)) {
$this->updateStatus("Error creating tables.", true); $this->updateStatus("Error creating tables.", true);