diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-20 17:05:58 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-20 17:05:58 +0100 |
| commit | f62747451d1f040b36db7611255d7c1b3cdffcdf (patch) | |
| tree | bdbf06d942fb0a19454d987de0d89f142709013c /system/libraries | |
| parent | bb3edf12d0ca82c62f7b7d570108375ec4379749 (diff) | |
Don't use error suppression on ini_get() either
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_apc.php | 2 | ||||
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | system/libraries/Upload.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php index d062103bd..de849c7e8 100644 --- a/system/libraries/Cache/drivers/Cache_apc.php +++ b/system/libraries/Cache/drivers/Cache_apc.php @@ -187,7 +187,7 @@ class CI_Cache_apc extends CI_Driver { */ 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; diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 93c19de5e..3c3c49e78 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -401,7 +401,7 @@ class CI_Email { $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'); diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 983d832fd..4939b158c 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1255,7 +1255,7 @@ class CI_Upload { } } - 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) |