diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-09-13 13:45:53 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-09-13 13:45:53 +0200 |
| commit | 5932a7354bf46fb0a86794af37da42f715c355bf (patch) | |
| tree | 550d77b948a23c6ff06f0bd74e1dedb887898d8f /system/libraries | |
| parent | 838c9a96f645aac24daa31285efa1051535c4219 (diff) | |
Improvements to safe_mode detection (it doesn't exist in PHP 5.4)
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 3 | ||||
| -rw-r--r-- | system/libraries/Upload.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 082629a4c..efdbfd7c1 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -399,9 +399,9 @@ class CI_Email { else { $this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === ''); - $this->_safe_mode = (bool) @ini_get('safe_mode'); } + $this->_safe_mode = ( ! is_php('5.4') && (bool) @ini_get('safe_mode')); $this->charset = strtoupper($this->charset); log_message('debug', 'Email Class Initialized'); @@ -451,7 +451,6 @@ class CI_Email { $this->clear(); $this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === ''); - $this->_safe_mode = (bool) @ini_get('safe_mode'); return $this; } diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 15eb74bd5..060973847 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1245,7 +1245,7 @@ class CI_Upload { } } - if ( (bool) @ini_get('safe_mode') === FALSE && function_usable('shell_exec')) + if ((bool) @ini_get('safe_mode') === FALSE && function_usable('shell_exec')) { $mime = @shell_exec($cmd); if (strlen($mime) > 0) |