summaryrefslogtreecommitdiffstats
path: root/system/core/Input.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-10-04 17:13:52 +0200
committerAndrey Andreev <narf@bofh.bg>2011-10-04 17:13:52 +0200
commit79edb997be293e997afc5e008125bf334855f4d4 (patch)
tree742c7065c8fa55fdcce26652bc82d52976554c8a /system/core/Input.php
parent2cec39f2c221d2acab5dbd830b6dd64db01b24d9 (diff)
parent0f614c692eb2db49da98b8eca6247bd8c245a64e (diff)
Merge upstream changes
Diffstat (limited to 'system/core/Input.php')
-rwxr-xr-xsystem/core/Input.php2
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);
}