From ca39f2efb2d827d13e4065535355de894965435a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 20 Feb 2014 02:30:14 +0200 Subject: Don't use error suppression with ini_set() --- system/core/CodeIgniter.php | 2 +- system/database/drivers/mssql/mssql_driver.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index eb3927e47..6d6747106 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -74,7 +74,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); register_shutdown_function('_shutdown_handler'); // Kill magic quotes - is_php('5.4') OR @ini_set('magic_quotes_runtime', 0); + is_php('5.4') OR ini_set('magic_quotes_runtime', 0); /* * ------------------------------------------------------ diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 655aa7148..9e53d4e6d 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -280,7 +280,7 @@ class CI_DB_mssql_driver extends CI_DB { */ protected function _db_set_charset($charset) { - return (@ini_set('mssql.charset', $charset) !== FALSE); + return (ini_set('mssql.charset', $charset) !== FALSE); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b