diff options
author | Derek Jones <derek.jones@ellislab.com> | 2009-08-05 06:26:11 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2009-08-05 06:26:11 +0200 |
commit | 962d2258f9b2f2b8e3dbce7368b69673e839eb54 (patch) | |
tree | 6b60b4c1079560eb34b1aa8aedde520816c7436e | |
parent | 652612d9cb509bdf54f1c8fe2aef9d138067548c (diff) |
protected @set_magic_quotes_runtime(0); from running under PHP 5.3, as it will trigger the loading of the Exceptions class, which triggers get_config() which will statically load some config items that might change later with $assign_to_config
-rw-r--r-- | system/codeigniter/CodeIgniter.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 5c14c7d3d..5cf7d2fdc 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -57,7 +57,11 @@ require(APPPATH.'config/constants'.EXT); * ------------------------------------------------------ */ set_error_handler('_exception_handler'); -@set_magic_quotes_runtime(0); // Kill magic quotes + +if ( ! is_php(5.3)) +{ + @set_magic_quotes_runtime(0); // Kill magic quotes +} /* * ------------------------------------------------------ |