summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysqli
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-05-08 22:28:08 +0200
committerAndrey Andreev <narf@devilix.net>2014-05-08 22:28:08 +0200
commit81b6efa76b90e28c87d1efad50dc13c2ac462ca8 (patch)
treea2a8f44f37c35c6803f21067aca71f47dea4749c /system/database/drivers/mysqli
parentc402865740a077bffb4eebd07335b64ca006c48a (diff)
parentd3ddf9763aba68eed1bce7dde275b9be253efcc0 (diff)
Merge pull request #3039 from mdunisch/develop
Remove error-masking '@' in mysqli_driver (See: #3036)
Diffstat (limited to 'system/database/drivers/mysqli')
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index c5565f629..09277fc39 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -144,7 +144,7 @@ class CI_DB_mysqli_driver extends CI_DB {
$database = $this->database;
}
- if (@$this->conn_id->select_db($database))
+ if ($this->conn_id->select_db($database))
{
$this->database = $database;
return TRUE;
@@ -197,7 +197,7 @@ class CI_DB_mysqli_driver extends CI_DB {
*/
protected function _execute($sql)
{
- return @$this->conn_id->query($this->_prep_query($sql));
+ return $this->conn_id->query($this->_prep_query($sql));
}
// --------------------------------------------------------------------