summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorWes Baker <wes@wesbaker.com>2013-07-08 23:22:21 +0200
committerWes Baker <wes@wesbaker.com>2013-07-08 23:22:21 +0200
commitc5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b (patch)
tree9078f2e847bee8adab51598e6a3e08e6e325dc38 /system
parent4c866e0b911fcc82cf49b317178788ce3c319bd4 (diff)
Updating User Guide for 2.1.4.
Diffstat (limited to 'system')
-rwxr-xr-xsystem/core/CodeIgniter.php2
-rwxr-xr-xsystem/core/Security.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index c16c79c09..e0819c801 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -33,7 +33,7 @@
* @var string
*
*/
- define('CI_VERSION', '2.1.3');
+ define('CI_VERSION', '2.1.4');
/**
* CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
diff --git a/system/core/Security.php b/system/core/Security.php
index b0d39b981..a7db5a46b 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -609,7 +609,7 @@ class CI_Security {
if ($is_image === TRUE)
{
/*
- * Adobe Photoshop puts XML metadata into JFIF images,
+ * Adobe Photoshop puts XML metadata into JFIF images,
* including namespacing, so we have to allow this for images.
*/
unset($evil_attributes[array_search('xmlns', $evil_attributes)]);