From 3138fa0b4080c135f4e509992f3c5d7fd82538de Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 24 May 2016 16:49:50 +0200 Subject: [PATCH] Check DB connection before any possible use --- lib/installer.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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); -- 2.39.5