diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 13:43:04 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 13:43:04 +0100 |
| commit | 7ccb7ecc8e84f8e4f4cdf5ed10247f4350c7ec34 (patch) | |
| tree | c070c13151562383c3f65507ca27d4153f50827a /system/libraries/Upload.php | |
| parent | 18c9ea77c7c68be38ea1b995cccff18ee2e6acb4 (diff) | |
| parent | c2905f5884a7d9cd9ae1f70cdc615a5d214652dd (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 { |