summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-07-01 07:34:32 +0200
committerAndrey Andreev <narf@devilix.net>2014-07-01 07:34:32 +0200
commit961db7dd3843ee7acba3557d4c82c2cd8ab9e937 (patch)
tree28f8fe180aad9a7c7656622f7100da77d609110a
parent60f744bb05b778f33230bb7dc31aeb2b6409e0b2 (diff)
parentc6b7f3e9d97ada4dd42098fa6b24c1c9799497f2 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
-rwxr-xr-xsystem/core/Security.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 2cf214b18..c4621d588 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -605,7 +605,7 @@ class CI_Security {
{
if (($char = array_search($matches[$i].';', $_entities, TRUE)) !== FALSE)
{
- $replace[$matches[$i]] = $character;
+ $replace[$matches[$i]] = $char;
}
}