diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-15 00:02:16 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-15 00:02:16 +0200 |
| commit | c9bb0c5b7a3a349a5c255b02b5cc7ddbe32132e5 (patch) | |
| tree | 905ff3f3153720c1d1547092e54feaf0e46568a6 /system/core/CodeIgniter.php | |
| parent | 3061ee737ff2c1853428482e1704b0973b621118 (diff) | |
| parent | f11a1939c25de1e327c7c02001c8fbd1ec1fc7b4 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rw-r--r--[-rwxr-xr-x] | system/core/CodeIgniter.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index b3e984d4d..8159b19f5 100755..100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -73,9 +73,9 @@ */ set_error_handler('_exception_handler'); - if ( ! is_php('5.3')) + if ( ! is_php('5.4')) { - @set_magic_quotes_runtime(0); // Kill magic quotes + @ini_set('magic_quotes_runtime', 0); // Kill magic quotes } /* |