arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #530 from tribut/connect-error

Browse Source 
Fix error 500 on database connect error
This commit is contained in:
Tobias Reich 2016-04-24 16:22:24 +02:00
commit 3bf4790487
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
php/Modules/Database.php
View File

@ -56,7 +56,7 @@ final class Database {
$connection = self::connect($host, $user, $password); $connection = self::connect($host, $user, $password);
// Check if the connection was successful // Check if the connection was successful
if ($connection===false) Response::error($connection->connect_error); if ($connection===false) Response::error(self::connect_error());
if (self::setCharset($connection)===false) Response::error('Could not set database charset!'); if (self::setCharset($connection)===false) Response::error('Could not set database charset!');
@ -90,6 +90,13 @@ final class Database {
} }
/**
* @return string Returns the string description of the last connect error
*/
public static function connect_error() {
return mysqli_connect_error();
}
/** /**
* @return boolean Returns true when successful. * @return boolean Returns true when successful.
*/ */