forked from GNUsocial/gnu-social
Merge remote-tracking branch 'upstream/master' into nightly
This commit is contained in:
commit
160df2f2d1
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user