diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-28 16:47:42 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-28 16:47:42 +0200 |
| commit | a0cd41c5187c738d043ca5a0dc5fbf80806fd322 (patch) | |
| tree | 75f145aeb7466dc150a2faf8764174234b48c47b /system/core/Input.php | |
| parent | 4d292bdb56ba6afc26878d9bcd82892f48d9f1a4 (diff) | |
| parent | 5a3284edd6f3de5871804c7e24a9d74e57b2b7a6 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Input.php')
| -rwxr-xr-x | system/core/Input.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index f39371fb0..6f8442107 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -555,7 +555,7 @@ class CI_Input { } // We strip slashes if magic quotes is on to keep things consistent - if (function_exists('get_magic_quotes_gpc') AND get_magic_quotes_gpc()) + if (function_exists('get_magic_quotes_gpc') AND @get_magic_quotes_gpc()) { $str = stripslashes($str); } |