summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-09-13 13:45:53 +0200
committerAndrey Andreev <narf@devilix.net>2013-09-13 13:45:53 +0200
commit5932a7354bf46fb0a86794af37da42f715c355bf (patch)
tree550d77b948a23c6ff06f0bd74e1dedb887898d8f /system/core/CodeIgniter.php
parent838c9a96f645aac24daa31285efa1051535c4219 (diff)
Improvements to safe_mode detection (it doesn't exist in PHP 5.4)
Diffstat (limited to 'system/core/CodeIgniter.php')
-rw-r--r--system/core/CodeIgniter.php6
1 files changed, 2 insertions, 4 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);
/*
* ------------------------------------------------------