diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2010-07-22 18:04:58 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2010-07-22 18:04:58 +0200 |
| commit | 924000e27e10eb32cff6b7666a9d41546fd5f2bd (patch) | |
| tree | 85373cad862ef668087daaa2804502df2c2e008d /system | |
| parent | ce3129d277d2235f0584a937114d0e636349ee9c (diff) | |
Fixed a bug in the Upload class where a PHP error could occur when wildcards were used as the allowed_types.
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index c94e4d448..c18c178df 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -988,7 +988,7 @@ class CI_Upload { */ function _prep_filename($filename) { - if (strpos($filename, '.') === FALSE) + if (strpos($filename, '.') === FALSE OR $this->allowed_types == '*') { return $filename; } @@ -1020,4 +1020,4 @@ class CI_Upload { // END Upload Class /* End of file Upload.php */ -/* Location: ./system/libraries/Upload.php */
\ No newline at end of file +/* Location: ./system/libraries/Upload.php */ |