commit ca39f2efb2d827d13e4065535355de894965435a
author Andrey Andreev <narf@devilix.net> Thu Feb 20 02:30:14 2014 +0200
committer Andrey Andreev <narf@devilix.net> Thu Feb 20 02:30:14 2014 +0200
tree 36e63c8173dfeb197e4c40762cc9390e8ba6054d
parent 02545895c1c6551be3b167bcada171fe9423d443

Don't use error suppression with ini_set()

system/core/CodeIgniter.php

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index eb3927e..6d67471 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -74,7 +74,7 @@
 	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);
 
 /*
  * ------------------------------------------------------

system/database/drivers/mssql/mssql_driver.php

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index 655aa71..9e53d4e 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -280,7 +280,7 @@
 	 */
 	protected function _db_set_charset($charset)
 	{
-		return (@ini_set('mssql.charset', $charset) !== FALSE);
+		return (ini_set('mssql.charset', $charset) !== FALSE);
 	}
 
 	// --------------------------------------------------------------------