BUG 6700 is solved, the installer don't crash any more
A validation before use mysql_error() was added and the error mesage was improbled
This commit is contained in:
@@ -443,7 +443,9 @@ class Installer
|
|||||||
public function check_db($dbName)
|
public function check_db($dbName)
|
||||||
{
|
{
|
||||||
if(!$this->connection_database) {
|
if(!$this->connection_database) {
|
||||||
return Array('status' => false, 'message' => mysql_error());
|
//erik: new verification if the mysql extension is enabled
|
||||||
|
$error = class_exists('mysql_error') ? mysql_error() : 'Mysql Module for PHP is not enabled!';
|
||||||
|
return Array('status' => false, 'message' => $error);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(!mysql_select_db($dbName,$this->connection_database) && $this->cc_status!=1) {
|
if(!mysql_select_db($dbName,$this->connection_database) && $this->cc_status!=1) {
|
||||||
@@ -482,11 +484,11 @@ class Installer
|
|||||||
'connection' => false,
|
'connection' => false,
|
||||||
'grant' => 0,
|
'grant' => 0,
|
||||||
'version' => false,
|
'version' => false,
|
||||||
'message' => "php-mysql is Not Installed",
|
'message' => "ERROR: Mysql Module for PHP is not enabled, try install <b>php-mysql</b> package.",
|
||||||
'ao'=>Array(
|
'ao'=>Array(
|
||||||
'ao_db_wf' => false,
|
'ao_db_wf' => false,
|
||||||
'ao_db_rb' => false,
|
'ao_db_rb' => false,
|
||||||
'ao_db_rp' => false
|
'ao_db_rp' => false
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user