tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX If there is *any* error connecting to MySQL, expose this to the installer.

Browse Source
This commit is contained in:
Sean Harvey 2012-05-19 11:29:25 +12:00
parent d58e37417f
commit aaf91154a2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev/install/MySQLDatabaseConfigurationHelper.php
View File

@ -30,12 +30,13 @@ class MySQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
$success = false; $success = false;
$error = ''; $error = '';
$conn = @new MySQLi($databaseConfig['server'], $databaseConfig['username'], $databaseConfig['password']); $conn = @new MySQLi($databaseConfig['server'], $databaseConfig['username'], $databaseConfig['password']);
if($conn && $conn->connect_errno < 2000) { if($conn && $conn->connect_errno) {
$success = true;
} else {
$success = false; $success = false;
$error = ($conn) ? $conn->connect_error : ''; $error = $conn->connect_error;
} else {
$success = true;
} }
return array( return array(
'success' => $success, 'success' => $success,
'error' => $error 'error' => $error