Don't use error suppression on ini_get() either

Author: narfbg

system/core/Common.php

@@ -83,7 +83,7 @@ function is_php($version = '5.3.0')
 	function is_really_writable($file)
 	{
 		// If we're on a Unix server with safe_mode off we call is_writable
-		if (DIRECTORY_SEPARATOR === '/' && (is_php('5.4') OR (bool) @ini_get('safe_mode') === FALSE))
+		if (DIRECTORY_SEPARATOR === '/' && (is_php('5.4') OR ! ini_get('safe_mode')))
 		{
 			return is_writable($file);
 		}
@@ -600,7 +600,7 @@ function _exception_handler($severity, $message, $filepath, $line)
 		$_error->log_exception($severity, $message, $filepath, $line);
 
 		// Should we display the error?
-		if ((bool) ini_get('display_errors') === TRUE)
+		if (ini_get('display_errors'))
 		{
 			$_error->show_php_error($severity, $message, $filepath, $line);
 		}
@@ -775,9 +775,9 @@ function function_usable($function_name)
 			{
 				if (extension_loaded('suhosin'))
 				{
-					$_suhosin_func_blacklist = explode(',', trim(@ini_get('suhosin.executor.func.blacklist')));
+					$_suhosin_func_blacklist = explode(',', trim(ini_get('suhosin.executor.func.blacklist')));
 
-					if ( ! in_array('eval', $_suhosin_func_blacklist, TRUE) && @ini_get('suhosin.executor.disable_eval'))
+					if ( ! in_array('eval', $_suhosin_func_blacklist, TRUE) && ini_get('suhosin.executor.disable_eval'))
 					{
 						$_suhosin_func_blacklist[] = 'eval';
 					}

system/core/Loader.php

@@ -901,9 +901,7 @@ protected function _ci_load($_ci_data)
 		// If the PHP installation does not support short tags we'll
 		// do a little string replacement, changing the short tags
 		// to standard PHP echo statements.
-		if ( ! is_php('5.4') && (bool) @ini_get('short_open_tag') === FALSE
-			&& config_item('rewrite_short_tags') === TRUE && function_usable('eval')
-		)
+		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE && function_usable('eval'))
 		{
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
 		}

system/core/Output.php

@@ -120,7 +120,7 @@ class CI_Output {
 	 */
 	public function __construct()
 	{
-		$this->_zlib_oc = (bool) @ini_get('zlib.output_compression');
+		$this->_zlib_oc = (bool) ini_get('zlib.output_compression');
 		$this->_compress_output = (
 			$this->_zlib_oc === FALSE
 			&& config_item('compress_output') === TRUE

system/libraries/Cache/drivers/Cache_apc.php

@@ -187,7 +187,7 @@ public function get_metadata($id)
 	 */
 	public function is_supported()
 	{
-		if ( ! extension_loaded('apc') OR ! (bool) @ini_get('apc.enabled'))
+		if ( ! extension_loaded('apc') OR ! ini_get('apc.enabled'))
 		{
 			log_message('debug', 'The APC PHP extension must be loaded to use APC Cache.');
 			return FALSE;

system/libraries/Email.php

@@ -401,7 +401,7 @@ public function __construct($config = array())
 			$this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === '');
 		}
 
-		$this->_safe_mode = ( ! is_php('5.4') && (bool) @ini_get('safe_mode'));
+		$this->_safe_mode = ( ! is_php('5.4') && ini_get('safe_mode'));
 		$this->charset = strtoupper($this->charset);
 
 		log_message('debug', 'Email Class Initialized');

system/libraries/Upload.php

@@ -1255,7 +1255,7 @@ protected function _file_mime_type($file)
 				}
 			}
 
-			if ((bool) @ini_get('safe_mode') === FALSE && function_usable('shell_exec'))
+			if ( ! ini_get('safe_mode') && function_usable('shell_exec'))
 			{
 				$mime = @shell_exec($cmd);
 				if (strlen($mime) > 0)