summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authormdunisch <subseven>2014-05-07 15:00:40 +0200
committermdunisch <subseven>2014-05-07 15:00:40 +0200
commitd3ddf9763aba68eed1bce7dde275b9be253efcc0 (patch)
treedba1947e151d0c087a6be9ec971c627f351d9fad /system
parent51593f49cda71bdf8400ba6555a9e1598ff21c7c (diff)
Remove error-masking '@' in mysqli_driver (See: https://github.com/EllisLab/CodeIgniter/issues/3036)
Diffstat (limited to 'system')
-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));
}
// --------------------------------------------------------------------