diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 14:01:58 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 14:01:58 +0100 |
commit | 3aaca2523de1a733c18473299cd3c72c9497869c (patch) | |
tree | 11d88239a0625e201c06f7bd78572862e6425a6c /system/libraries/Upload.php | |
parent | 005700340b444f3cfee8df98f5bf30b32c4a5085 (diff) | |
parent | 41e46a97a43b0d5080bb9ace1b9326266955ef21 (diff) |
Merge upstream branch
Diffstat (limited to 'system/libraries/Upload.php')
-rw-r--r-- | system/libraries/Upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 82383f658..0b853233d 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -960,7 +960,7 @@ class CI_Upload { } elseif (is_file(APPPATH.'config/mimes.php')) { - include(APPPATH.'config//mimes.php'); + include(APPPATH.'config/mimes.php'); } else { |