summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-20 01:30:14 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-20 01:30:14 +0100
commitca39f2efb2d827d13e4065535355de894965435a (patch)
tree36e63c8173dfeb197e4c40762cc9390e8ba6054d
parent02545895c1c6551be3b167bcada171fe9423d443 (diff)
Don't use error suppression with ini_set()
-rw-r--r--system/core/CodeIgniter.php2
-rw-r--r--system/database/drivers/mssql/mssql_driver.php2
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);
}
// --------------------------------------------------------------------