summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-01-28 15:28:06 +0100
committerAndrey Andreev <narf@bofh.bg>2013-01-28 15:28:06 +0100
commit7960d20d0125b1146ed286bfc8c7010fbf56d9a8 (patch)
tree7e6bbd4d6bb928388171714d843e37cc04544e4b
parent3608e1a094945631c5b65e1f66460e4486c5b541 (diff)
parent9711b060063e4cd830197ce57e1844aa25d34dff (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
-rw-r--r--system/libraries/Upload.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 96bb17edc..1f0bd6a6e 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1005,7 +1005,14 @@ class CI_Upload {
'%3d' // =
);
- return stripslashes(str_replace($bad, '', $filename));
+ do
+ {
+ $old_filename = $filename;
+ $filename = str_replace($bad, '', $filename);
+ }
+ while ($old_filename !== $filename);
+
+ return stripslashes($filename);
}
// --------------------------------------------------------------------