summaryrefslogtreecommitdiffstats
path: root/system/libraries/Upload.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-30 13:57:26 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-30 13:57:26 +0200
commitfd2ceab417bbb696134910ce0eaeca34bea3e1e5 (patch)
tree0eeb742a553a36bf2375793661ff3e7925f792a6 /system/libraries/Upload.php
parent6763522d29416b7db90a6d3c5dceffe1536d8efe (diff)
parent11fd4b8759438f216318e3e1e004f918b88a56ad (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/libraries/Upload.php')
-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', // <