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/core | |
| parent | 838c9a96f645aac24daa31285efa1051535c4219 (diff) | |
Improvements to safe_mode detection (it doesn't exist in PHP 5.4)
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/CodeIgniter.php | 6 | ||||
| -rw-r--r-- | system/core/Common.php | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 67c94cfd1..c12116236 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -75,10 +75,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); set_error_handler('_exception_handler'); register_shutdown_function('_shutdown_handler'); - if ( ! is_php('5.4')) - { - @ini_set('magic_quotes_runtime', 0); // Kill magic quotes - } + // Kill magic quotes + is_php('5.4') OR @ini_set('magic_quotes_runtime', 0); /* * ------------------------------------------------------ diff --git a/system/core/Common.php b/system/core/Common.php index cf81e3fb5..286deccda 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -82,7 +82,7 @@ if ( ! function_exists('is_really_writable')) function is_really_writable($file) { // If we're on a Unix server with safe_mode off we call is_writable - if (DIRECTORY_SEPARATOR === '/' && (bool) @ini_get('safe_mode') === FALSE) + if (DIRECTORY_SEPARATOR === '/' && (is_php('5.4') OR (bool) @ini_get('safe_mode') === FALSE)) { return is_writable($file); } |