summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorRoot <development@fractureme.com>2012-05-26 00:52:59 +0200
committerRoot <development@fractureme.com>2012-05-26 00:52:59 +0200
commit99e602d25051ed449255fe16c4aa0aadd7d05c1f (patch)
treea0a9d0cdf4e741fcff68a2ecd70c198a43b5d787 /system/libraries
parent35ac46d4aad12fe723229feca403b4dee3efcc27 (diff)
parentf33e2ff30b0a9c54d6e8adbe88662838b9bd525e (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Upload.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 271c6d21f..7456e922a 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -747,6 +747,8 @@ class CI_Upload {
';',
'?',
'/',
+ '!',
+ '#',
'%20',
'%22',
'%3c', // <