From 2bbbd1a13ead097fd3f4b00bfb275f0b0f836f93 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 May 2014 10:24:14 +0300 Subject: Remove (most of) error suppression from database drivers (issue #3036) --- system/database/drivers/odbc/odbc_driver.php | 6 +++--- system/database/drivers/odbc/odbc_result.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'system/database/drivers/odbc') diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 14c85c8e2..06c24d66f 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -124,7 +124,7 @@ class CI_DB_odbc_driver extends CI_DB { */ protected function _execute($sql) { - return @odbc_exec($this->conn_id, $sql); + return odbc_exec($this->conn_id, $sql); } // -------------------------------------------------------------------- @@ -213,7 +213,7 @@ class CI_DB_odbc_driver extends CI_DB { */ public function affected_rows() { - return @odbc_num_rows($this->result_id); + return odbc_num_rows($this->result_id); } // -------------------------------------------------------------------- @@ -357,7 +357,7 @@ class CI_DB_odbc_driver extends CI_DB { */ protected function _close() { - @odbc_close($this->conn_id); + odbc_close($this->conn_id); } } diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index 5b2df3943..3a101cd7e 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -49,7 +49,7 @@ class CI_DB_odbc_result extends CI_DB_result { { return $this->num_rows; } - elseif (($this->num_rows = @odbc_num_rows($this->result_id)) !== -1) + elseif (($this->num_rows = odbc_num_rows($this->result_id)) !== -1) { return $this->num_rows; } @@ -76,7 +76,7 @@ class CI_DB_odbc_result extends CI_DB_result { */ public function num_fields() { - return @odbc_num_fields($this->result_id); + return odbc_num_fields($this->result_id); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b