From aaf91154a26f35d5e82ab444618cc10e3651dc59 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Sat, 19 May 2012 11:29:25 +1200 Subject: [PATCH] BUGFIX If there is *any* error connecting to MySQL, expose this to the installer. --- dev/install/MySQLDatabaseConfigurationHelper.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev/install/MySQLDatabaseConfigurationHelper.php b/dev/install/MySQLDatabaseConfigurationHelper.php index 395363c29..6b68263d9 100644 --- a/dev/install/MySQLDatabaseConfigurationHelper.php +++ b/dev/install/MySQLDatabaseConfigurationHelper.php @@ -30,12 +30,13 @@ class MySQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper { $success = false; $error = ''; $conn = @new MySQLi($databaseConfig['server'], $databaseConfig['username'], $databaseConfig['password']); - if($conn && $conn->connect_errno < 2000) { - $success = true; - } else { + if($conn && $conn->connect_errno) { $success = false; - $error = ($conn) ? $conn->connect_error : ''; + $error = $conn->connect_error; + } else { + $success = true; } + return array( 'success' => $success, 'error' => $error