diff options
| -rw-r--r-- | system/database/drivers/ibase/ibase_driver.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/system/database/drivers/ibase/ibase_driver.php b/system/database/drivers/ibase/ibase_driver.php index c85b19955..b9eabd00e 100644 --- a/system/database/drivers/ibase/ibase_driver.php +++ b/system/database/drivers/ibase/ibase_driver.php @@ -75,8 +75,8 @@ class CI_DB_ibase_driver extends CI_DB { public function db_connect($persistent = FALSE) { return ($persistent === TRUE) - ? @ibase_pconnect($this->hostname.':'.$this->database, $this->username, $this->password, $this->char_set) - : @ibase_connect($this->hostname.':'.$this->database, $this->username, $this->password, $this->char_set); + ? ibase_pconnect($this->hostname.':'.$this->database, $this->username, $this->password, $this->char_set) + : ibase_connect($this->hostname.':'.$this->database, $this->username, $this->password, $this->char_set); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 075542ae0..afe80e8d9 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -98,8 +98,8 @@ class CI_DB_mssql_driver extends CI_DB { public function db_connect($persistent = FALSE) { $this->conn_id = ($persistent) - ? @mssql_pconnect($this->hostname, $this->username, $this->password) - : @mssql_connect($this->hostname, $this->username, $this->password); + ? mssql_pconnect($this->hostname, $this->username, $this->password) + : mssql_connect($this->hostname, $this->username, $this->password); if ( ! $this->conn_id) { diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 9fbd94ce8..396869b4d 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -120,8 +120,8 @@ class CI_DB_mysql_driver extends CI_DB { } $this->conn_id = ($persistent === TRUE) - ? @mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags) - : @mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags); + ? mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags) + : mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags); // ---------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index b2d0bcc87..6ab304901 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -107,7 +107,7 @@ class CI_DB_mysqli_driver extends CI_DB { $mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode="STRICT_ALL_TABLES"'); } - return @$mysqli->real_connect($hostname, $this->username, $this->password, $this->database, $port, NULL, $client_flags) + return $mysqli->real_connect($hostname, $this->username, $this->password, $this->database, $port, NULL, $client_flags) ? $mysqli : FALSE; } diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 01731489f..1d4e626d4 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -119,7 +119,7 @@ class CI_DB_pdo_driver extends CI_DB { try { - return @new PDO($this->dsn, $this->username, $this->password, $this->options); + return new PDO($this->dsn, $this->username, $this->password, $this->options); } catch (PDOException $e) { diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 1140d501b..6a2209755 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -139,7 +139,7 @@ class CI_DB_postgre_driver extends CI_DB { public function db_connect($persistent = FALSE) { if ($persistent === TRUE - && ($this->conn_id = @pg_pconnect($this->dsn)) + && ($this->conn_id = pg_pconnect($this->dsn)) && pg_connection_status($this->conn_id) === PGSQL_CONNECTION_BAD && pg_ping($this->conn_id) === FALSE ) @@ -148,7 +148,7 @@ class CI_DB_postgre_driver extends CI_DB { } else { - $this->conn_id = @pg_connect($this->dsn); + $this->conn_id = pg_connect($this->dsn); } if ($this->conn_id && ! empty($this->schema)) |