diff --git a/api/src/Db.php b/api/src/Db.php index 98e97135d5..86a62b1ec9 100644 --- a/api/src/Db.php +++ b/api/src/Db.php @@ -298,7 +298,7 @@ class Db * @throws Db\Exception\Connection * @return ADOConnection */ - function connect($Database = NULL, $Host = NULL, $Port = NULL, $User = NULL, $Password = NULL,$Type = NULL) + function connect($Database = NULL, $Host = NULL, $Port = NULL, $User = NULL, $Password = NULL, $Type = NULL) { /* Handle defaults */ if (!is_null($Database) && $Database) @@ -347,7 +347,7 @@ class Db return $this->Link_ID; } catch(Db\Exception\Connection $e) { - _egw_log_exception($e); + //_egw_log_exception($e); $this->disconnect(); // force a new connect $this->Type = $this->setupType; // get set to "mysql" for "mysqli" $use_host_from_session = false; // re-try with next host from list diff --git a/setup/inc/class.setup_cmd_database.inc.php b/setup/inc/class.setup_cmd_database.inc.php index 82c3579ecd..950567c787 100644 --- a/setup/inc/class.setup_cmd_database.inc.php +++ b/setup/inc/class.setup_cmd_database.inc.php @@ -184,7 +184,7 @@ class setup_cmd_database extends setup_cmd substr(str_replace(array('.', '-'), '_', $this->db_name),0,self::MAX_DB_NAME_LEN); } try { - $msg = @$this->connect(); + $msg = $this->connect(); } catch (Api\Exception\WrongUserinput $e) { // db or user not working --> connect as root and create it